diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-01-11 17:47:25 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-01-11 17:47:25 -0800 |
| commit | 009f773836513960d3982e80c86e266d25528563 (patch) | |
| tree | 7315e5666698997dee34a80c1a1db801d3f8879b /Documentation/devicetree/bindings/input/gpio-keys.txt | |
| parent | dd0d0d4de582a6a61c032332c91f4f4cb2bab569 (diff) | |
| parent | 6544a1df11c48c8413071aac3316792e4678fbfb (diff) | |
| download | op-kernel-dev-009f773836513960d3982e80c86e266d25528563.zip op-kernel-dev-009f773836513960d3982e80c86e266d25528563.tar.gz | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.5 merge window.
Diffstat (limited to 'Documentation/devicetree/bindings/input/gpio-keys.txt')
| -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 072bf75..cf1333d 100644 --- a/Documentation/devicetree/bindings/input/gpio-keys.txt +++ b/Documentation/devicetree/bindings/input/gpio-keys.txt @@ -24,6 +24,7 @@ Optional subnode-properties: - debounce-interval: Debouncing interval time in milliseconds. If not specified defaults to 5. - wakeup-source: Boolean, button can wake-up the system. + (Legacy property supported: "gpio-key,wakeup") - linux,can-disable: Boolean, indicates that button is connected to dedicated (not shared) interrupt which can be disabled to suppress events from the button. |
