From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/Documentation/devicetree/bindings/input/gpio-keys.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'kernel/Documentation/devicetree/bindings/input/gpio-keys.txt') diff --git a/kernel/Documentation/devicetree/bindings/input/gpio-keys.txt b/kernel/Documentation/devicetree/bindings/input/gpio-keys.txt index 44b705767..cf1333d1d 100644 --- a/kernel/Documentation/devicetree/bindings/input/gpio-keys.txt +++ b/kernel/Documentation/devicetree/bindings/input/gpio-keys.txt @@ -23,7 +23,8 @@ Optional subnode-properties: If not specified defaults to <1> == EV_KEY. - debounce-interval: Debouncing interval time in milliseconds. If not specified defaults to 5. - - gpio-key,wakeup: Boolean, button can wake-up the system. + - 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. -- cgit 1.2.3-korg