mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: update multi-touch protocol documentation Input: add the ABS_MT_PRESSURE event Input: winbond-cir - remove dmesg spam Input: lifebook - add another Lifebook DMI signature Input: ad7879 - support auxiliary GPIOs via gpiolib
This commit is contained in:
commit
499a267371
7 changed files with 198 additions and 69 deletions
|
|
@ -660,6 +660,7 @@ struct input_absinfo {
|
|||
#define ABS_MT_TOOL_TYPE 0x37 /* Type of touching device */
|
||||
#define ABS_MT_BLOB_ID 0x38 /* Group a set of packets as a blob */
|
||||
#define ABS_MT_TRACKING_ID 0x39 /* Unique ID of initiated contact */
|
||||
#define ABS_MT_PRESSURE 0x3a /* Pressure on contact area */
|
||||
|
||||
#define ABS_MAX 0x3f
|
||||
#define ABS_CNT (ABS_MAX+1)
|
||||
|
|
|
|||
|
|
@ -28,8 +28,12 @@ struct ad7879_platform_data {
|
|||
* 1 = 4, 2 = 8, 3 = 16 (median > averaging)
|
||||
*/
|
||||
u8 median;
|
||||
/* 1 = AUX/VBAT/GPIO set to GPIO Output */
|
||||
u8 gpio_output;
|
||||
/* Initial GPIO pin state (valid if gpio_output = 1) */
|
||||
u8 gpio_default;
|
||||
/* 1 = AUX/VBAT/GPIO export GPIO to gpiolib
|
||||
* requires CONFIG_GPIOLIB
|
||||
*/
|
||||
bool gpio_export;
|
||||
/* identifies the first GPIO number handled by this chip;
|
||||
* or, if negative, requests dynamic ID allocation.
|
||||
*/
|
||||
s32 gpio_base;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue