summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2016-01-22 04:27:27 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-01-22 04:27:27 +0300
commitb26a95d435190a44483f7fbad1328f825b7901d0 (patch)
treefce7033e78f5680d18dca36352f9c08d25007b20 /Documentation
parent009f773836513960d3982e80c86e266d25528563 (diff)
parent809d9516da73345cca587743b57e45e9095d851e (diff)
downloadlinux-b26a95d435190a44483f7fbad1328f825b7901d0.tar.xz
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.5 merge window.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/input/gpio-keys.txt1
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: