mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 21:54:34 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov: "This fixes recent regression where /dev/input/mice got assigned wrong device node which messed up setups with static /dev, and a regression in ads7846 GPIO debounce setup." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: ARM - OMAP: ads7846: fix pendown debounce setting Input: ads7846 - enable pendown GPIO debounce time setting Input: mousedev - move /dev/input/mice to the correct minor Input: MT - document new 'flags' argument of input_mt_init_slots()
This commit is contained in:
commit
26d29d06ea
5 changed files with 34 additions and 19 deletions
|
|
@ -46,8 +46,9 @@ struct ads7846_platform_data {
|
|||
u16 debounce_rep; /* additional consecutive good readings
|
||||
* required after the first two */
|
||||
int gpio_pendown; /* the GPIO used to decide the pendown
|
||||
* state if get_pendown_state == NULL
|
||||
*/
|
||||
* state if get_pendown_state == NULL */
|
||||
int gpio_pendown_debounce; /* platform specific debounce time for
|
||||
* the gpio_pendown */
|
||||
int (*get_pendown_state)(void);
|
||||
int (*filter_init) (const struct ads7846_platform_data *pdata,
|
||||
void **filter_data);
|
||||
|
|
|
|||
Loading…
Reference in a new issue