aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSudeep Holla <sudeep.holla@arm.com>2015-10-16 12:01:36 -0400
committerOlof Johansson <olof@lixom.net>2015-10-22 12:53:57 -0400
commit4db7062c9a8bff92137bb2f381d81dd1bb5b7872 (patch)
tree4294a650e06e96827788fec470eea226075bac17
parent55f41297576ddb7868af2f13f3a8107178dee2d0 (diff)
ARM: dts: fix gpio-keys wakeup-source property
The keyboard driver for GPIO buttons(gpio-keys) checks for one of the two boolean properties to enable gpio buttons as wakeup source: 1. "wakeup-source" or 2. the legacy "gpio-key,wakeup" However juno, ste-snowball and emev2-kzm9d dts file have a undetected "wakeup" property to indictate the wakeup source. This patch fixes it by making use of "wakeup-source" property. Cc: Magnus Damm <magnus.damm@gmail.com> Acked-by: Simon Horman <horms@verge.net.au> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat
-rw-r--r--arch/arm/boot/dts/emev2-kzm9d.dts8
-rw-r--r--arch/arm/boot/dts/ste-snowball.dts10
-rw-r--r--arch/arm64/boot/dts/arm/juno-motherboard.dtsi12
3 files changed, 15 insertions, 15 deletions
diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts
index 955c24ee4a8c..8c24975e8f9d 100644
--- a/arch/arm/boot/dts/emev2-kzm9d.dts
+++ b/arch/arm/boot/dts/emev2-kzm9d.dts
@@ -35,28 +35,28 @@
35 35
36 button@1 { 36 button@1 {
37 debounce_interval = <50>; 37 debounce_interval = <50>;
38 wakeup = <1>; 38 wakeup-source;
39 label = "DSW2-1"; 39 label = "DSW2-1";
40 linux,code = <KEY_1>; 40 linux,code = <KEY_1>;
41 gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; 41 gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
42 }; 42 };
43 button@2 { 43 button@2 {
44 debounce_interval = <50>; 44 debounce_interval = <50>;
45 wakeup = <1>; 45 wakeup-source;
46 label = "DSW2-2"; 46 label = "DSW2-2";
47 linux,code = <KEY_2>; 47 linux,code = <KEY_2>;
48 gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; 48 gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
49 }; 49 };
50 button@3 { 50 button@3 {
51 debounce_interval = <50>; 51 debounce_interval = <50>;
52 wakeup = <1>; 52 wakeup-source;
53 label = "DSW2-3"; 53 label = "DSW2-3";
54 linux,code = <KEY_3>; 54 linux,code = <KEY_3>;
55 gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; 55 gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
56 }; 56 };
57 button@4 { 57 button@4 {
58 debounce_interval = <50>; 58 debounce_interval = <50>;
59 wakeup = <1>; 59 wakeup-source;
60 label = "DSW2-4"; 60 label = "DSW2-4";
61 linux,code = <KEY_4>; 61 linux,code = <KEY_4>;
62 gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>; 62 gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index 32a5ccb14e7e..e80e42163883 100644
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -47,35 +47,35 @@
47 47
48 button@1 { 48 button@1 {
49 debounce_interval = <50>; 49 debounce_interval = <50>;
50 wakeup = <1>; 50 wakeup-source;
51 linux,code = <2>; 51 linux,code = <2>;
52 label = "userpb"; 52 label = "userpb";
53 gpios = <&gpio1 0 0x4>; 53 gpios = <&gpio1 0 0x4>;
54 }; 54 };
55 button@2 { 55 button@2 {
56 debounce_interval = <50>; 56 debounce_interval = <50>;
57 wakeup = <1>; 57 wakeup-source;
58 linux,code = <3>; 58 linux,code = <3>;
59 label = "extkb1"; 59 label = "extkb1";
60 gpios = <&gpio4 23 0x4>; 60 gpios = <&gpio4 23 0x4>;
61 }; 61 };
62 button@3 { 62 button@3 {
63 debounce_interval = <50>; 63 debounce_interval = <50>;
64 wakeup = <1>; 64 wakeup-source;
65 linux,code = <4>; 65 linux,code = <4>;
66 label = "extkb2"; 66 label = "extkb2";
67 gpios = <&gpio4 24 0x4>; 67 gpios = <&gpio4 24 0x4>;
68 }; 68 };
69 button@4 { 69 button@4 {
70 debounce_interval = <50>; 70 debounce_interval = <50>;
71 wakeup = <1>; 71 wakeup-source;
72 linux,code = <5>; 72 linux,code = <5>;
73 label = "extkb3"; 73 label = "extkb3";
74 gpios = <&gpio5 1 0x4>; 74 gpios = <&gpio5 1 0x4>;
75 }; 75 };
76 button@5 { 76 button@5 {
77 debounce_interval = <50>; 77 debounce_interval = <50>;
78 wakeup = <1>; 78 wakeup-source;
79 linux,code = <6>; 79 linux,code = <6>;
80 label = "extkb4"; 80 label = "extkb4";
81 gpios = <&gpio5 2 0x4>; 81 gpios = <&gpio5 2 0x4>;
diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index 637e046f0e36..3c386680357e 100644
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -61,42 +61,42 @@
61 61
62 button@1 { 62 button@1 {
63 debounce_interval = <50>; 63 debounce_interval = <50>;
64 wakeup = <1>; 64 wakeup-source;
65 linux,code = <116>; 65 linux,code = <116>;
66 label = "POWER"; 66 label = "POWER";
67 gpios = <&iofpga_gpio0 0 0x4>; 67 gpios = <&iofpga_gpio0 0 0x4>;
68 }; 68 };
69 button@2 { 69 button@2 {
70 debounce_interval = <50>; 70 debounce_interval = <50>;
71 wakeup = <1>; 71 wakeup-source;
72 linux,code = <102>; 72 linux,code = <102>;
73 label = "HOME"; 73 label = "HOME";
74 gpios = <&iofpga_gpio0 1 0x4>; 74 gpios = <&iofpga_gpio0 1 0x4>;
75 }; 75 };
76 button@3 { 76 button@3 {
77 debounce_interval = <50>; 77 debounce_interval = <50>;
78 wakeup = <1>; 78 wakeup-source;
79 linux,code = <152>; 79 linux,code = <152>;
80 label = "RLOCK"; 80 label = "RLOCK";
81 gpios = <&iofpga_gpio0 2 0x4>; 81 gpios = <&iofpga_gpio0 2 0x4>;
82 }; 82 };
83 button@4 { 83 button@4 {
84 debounce_interval = <50>; 84 debounce_interval = <50>;
85 wakeup = <1>; 85 wakeup-source;
86 linux,code = <115>; 86 linux,code = <115>;
87 label = "VOL+"; 87 label = "VOL+";
88 gpios = <&iofpga_gpio0 3 0x4>; 88 gpios = <&iofpga_gpio0 3 0x4>;
89 }; 89 };
90 button@5 { 90 button@5 {
91 debounce_interval = <50>; 91 debounce_interval = <50>;
92 wakeup = <1>; 92 wakeup-source;
93 linux,code = <114>; 93 linux,code = <114>;
94 label = "VOL-"; 94 label = "VOL-";
95 gpios = <&iofpga_gpio0 4 0x4>; 95 gpios = <&iofpga_gpio0 4 0x4>;
96 }; 96 };
97 button@6 { 97 button@6 {
98 debounce_interval = <50>; 98 debounce_interval = <50>;
99 wakeup = <1>; 99 wakeup-source;
100 linux,code = <99>; 100 linux,code = <99>;
101 label = "NMI"; 101 label = "NMI";
102 gpios = <&iofpga_gpio0 5 0x4>; 102 gpios = <&iofpga_gpio0 5 0x4>;
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-29 09:24:45 -0400