diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-22 17:20:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-22 17:20:30 -0800 |
| commit | 5430dfe90db8a4443fa7f9b62c77e82f768dd797 (patch) | |
| tree | ad782c9f753c8224b50f2d8d4aef6291c743be92 /Documentation | |
| parent | 4adea1fd2773a88c30ecd77d4e5d256fa40908e2 (diff) | |
| parent | b26a95d435190a44483f7fbad1328f825b7901d0 (diff) | |
| download | linux-5430dfe90db8a4443fa7f9b62c77e82f768dd797.tar.gz linux-5430dfe90db8a4443fa7f9b62c77e82f768dd797.tar.bz2 linux-5430dfe90db8a4443fa7f9b62c77e82f768dd797.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull more input updates from Dmitry Torokhov:
"The second round of updates for the input subsystem, mainly changes to
xpad driver to better hanlde Xbox One controllers"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: gpio-keys - allow disabling individual buttons in DT
Input: gpio-keys - allow setting input device name in DT
Input: xpad - correct xbox one pad device name
Input: atmel_mxt_ts - improve touchscreen size/orientation handling
Input: xpad - use LED API when identifying wireless controllers
Input: xpad - workaround dead irq_out after suspend/ resume
Input: xpad - update Xbox One Force Feedback Support
Input: xpad - correctly handle concurrent LED and FF requests
Input: xpad - handle "present" and "gone" correctly
Input: xpad - remove spurious events of wireless xpad 360 controller
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/input/gpio-keys.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/input/gpio-keys.txt b/Documentation/devicetree/bindings/input/gpio-keys.txt index cf1333d1dd52..21641236c095 100644 --- a/Documentation/devicetree/bindings/input/gpio-keys.txt +++ b/Documentation/devicetree/bindings/input/gpio-keys.txt @@ -6,6 +6,7 @@ Required properties: Optional properties: - autorepeat: Boolean, Enable auto repeat feature of Linux input subsystem. + - label: String, name of the input device. Each button (key) is represented as a sub-node of "gpio-keys": Subnode properties: |