diff options
| author | Nick Dyer <nick.dyer@itdev.co.uk> | 2014-09-11 13:31:45 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-09-12 02:33:09 -0400 |
| commit | 807362cd960daac415e2c8906750b2472c22c80e (patch) | |
| tree | 4dd0821bcc53a80607818b4ff5126ac2b49665c9 | |
| parent | 266e43c4eb81440e81da6c51bc5d4f9be2b7839c (diff) | |
Input: atmel_mxt_ts - fix merge in DT documentation
Something went a bit wrong in merging f5940231a - there's a bit of repeated
text that's been introduced.
Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| -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, |