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/mfd/tc3589x.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'kernel/Documentation/devicetree/bindings/mfd/tc3589x.txt') diff --git a/kernel/Documentation/devicetree/bindings/mfd/tc3589x.txt b/kernel/Documentation/devicetree/bindings/mfd/tc3589x.txt index 6fcedba46..23fc2f21f 100644 --- a/kernel/Documentation/devicetree/bindings/mfd/tc3589x.txt +++ b/kernel/Documentation/devicetree/bindings/mfd/tc3589x.txt @@ -55,7 +55,8 @@ Optional nodes: - linux,keymap: the definition can be found in bindings/input/matrix-keymap.txt - linux,no-autorepeat: do no enable autorepeat feature. - - linux,wakeup: use any event on keypad as wakeup event. + - wakeup-source: use any event on keypad as wakeup event. + (Legacy property supported: "linux,wakeup") Example: @@ -84,7 +85,6 @@ tc35893@44 { keypad,num-columns = <8>; keypad,num-rows = <8>; linux,no-autorepeat; - linux,wakeup; linux,keymap = <0x0301006b 0x04010066 0x06040072 @@ -103,5 +103,6 @@ tc35893@44 { 0x01030039 0x07060069 0x050500d9>; + wakeup-source; }; }; -- cgit 1.2.3-korg