diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-15 18:12:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-15 18:12:01 -0400 |
| commit | b92178623f190a9898fed3632fb40b17f6789673 (patch) | |
| tree | 6c0742d47f8ce10e3c553b948a5003253ee4524e /Documentation | |
| parent | f3b5933190c1fc5ad8f3a1dec594e9e849e088c0 (diff) | |
| parent | 807362cd960daac415e2c8906750b2472c22c80e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"A few quirks for i8042/AT keyboards and a small device tree doc fix
for Atmel Touchscreens"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: atmel_mxt_ts - fix merge in DT documentation
Input: i8042 - also set the firmware id for MUXed ports
Input: i8042 - add nomux quirk for Avatar AVIU-145A6
Input: i8042 - add Fujitsu U574 to no_timeout dmi table
Input: atkbd - do not try 'deactivate' keyboard on any LG laptops
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/input/atmel,maxtouch.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt index 0ac23f2ed104..1852906517ab 100644 --- a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt +++ b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt | |||
| @@ -11,10 +11,6 @@ Required properties: | |||
| 11 | 11 | ||
| 12 | Optional properties for main touchpad device: | 12 | Optional properties for main touchpad device: |
| 13 | 13 | ||
| 14 | - linux,gpio-keymap: An array of up to 4 entries indicating the Linux | ||
| 15 | keycode generated by each GPIO. Linux keycodes are defined in | ||
| 16 | <dt-bindings/input/input.h>. | ||
| 17 | |||
| 18 | - linux,gpio-keymap: When enabled, the SPT_GPIOPWN_T19 object sends messages | 14 | - linux,gpio-keymap: When enabled, the SPT_GPIOPWN_T19 object sends messages |
| 19 | on GPIO bit changes. An array of up to 8 entries can be provided | 15 | on GPIO bit changes. An array of up to 8 entries can be provided |
| 20 | indicating the Linux keycode mapped to each bit of the status byte, | 16 | indicating the Linux keycode mapped to each bit of the status byte, |