From 7439e0ffa8f712bd7a2833bb881e4ddb90c5d527 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 9 Feb 2015 08:45:46 +0100 Subject: dts: update to v3.19-rc3 Signed-off-by: Sascha Hauer --- dts/Bindings/input/gpio-keys.txt | 10 +++++++--- dts/Bindings/input/stmpe-keypad.txt | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'dts/Bindings') diff --git a/dts/Bindings/input/gpio-keys.txt b/dts/Bindings/input/gpio-keys.txt index a4a38fcf2e..44b705767a 100644 --- a/dts/Bindings/input/gpio-keys.txt +++ b/dts/Bindings/input/gpio-keys.txt @@ -10,12 +10,13 @@ Optional properties: Each button (key) is represented as a sub-node of "gpio-keys": Subnode properties: + - gpios: OF device-tree gpio specification. + - interrupts: the interrupt line for that input. - label: Descriptive name of the key. - linux,code: Keycode to emit. -Required mutual exclusive subnode-properties: - - gpios: OF device-tree gpio specification. - - interrupts: the interrupt line for that input +Note that either "interrupts" or "gpios" properties can be omitted, but not +both at the same time. Specifying both properties is allowed. Optional subnode-properties: - linux,input-type: Specify event type this button/key generates. @@ -23,6 +24,9 @@ Optional subnode-properties: - debounce-interval: Debouncing interval time in milliseconds. If not specified defaults to 5. - gpio-key,wakeup: Boolean, button can wake-up the system. + - linux,can-disable: Boolean, indicates that button is connected + to dedicated (not shared) interrupt which can be disabled to + suppress events from the button. Example nodes: diff --git a/dts/Bindings/input/stmpe-keypad.txt b/dts/Bindings/input/stmpe-keypad.txt index 1b97222e8a..12bb771d66 100644 --- a/dts/Bindings/input/stmpe-keypad.txt +++ b/dts/Bindings/input/stmpe-keypad.txt @@ -8,6 +8,8 @@ Optional properties: - debounce-interval : Debouncing interval time in milliseconds - st,scan-count : Scanning cycles elapsed before key data is updated - st,no-autorepeat : If specified device will not autorepeat + - keypad,num-rows : See ./matrix-keymap.txt + - keypad,num-columns : See ./matrix-keymap.txt Example: -- cgit v1.2.3