diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-01-21 17:27:27 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-01-21 17:27:27 -0800 |
| commit | b26a95d435190a44483f7fbad1328f825b7901d0 (patch) | |
| tree | fce7033e78f5680d18dca36352f9c08d25007b20 /Documentation | |
| parent | 009f773836513960d3982e80c86e266d25528563 (diff) | |
| parent | 809d9516da73345cca587743b57e45e9095d851e (diff) | |
| download | linux-b26a95d435190a44483f7fbad1328f825b7901d0.tar.gz linux-b26a95d435190a44483f7fbad1328f825b7901d0.tar.bz2 linux-b26a95d435190a44483f7fbad1328f825b7901d0.zip | |
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.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: |