提交 4db7062c 编写于 作者: S Sudeep Holla 提交者: Olof Johansson

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: NSimon Horman <horms@verge.net.au>
Reviewed-by: NLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: NSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: NOlof Johansson <olof@lixom.net>
上级 55f41297
...@@ -35,28 +35,28 @@ ...@@ -35,28 +35,28 @@
button@1 { button@1 {
debounce_interval = <50>; debounce_interval = <50>;
wakeup = <1>; wakeup-source;
label = "DSW2-1"; label = "DSW2-1";
linux,code = <KEY_1>; linux,code = <KEY_1>;
gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
}; };
button@2 { button@2 {
debounce_interval = <50>; debounce_interval = <50>;
wakeup = <1>; wakeup-source;
label = "DSW2-2"; label = "DSW2-2";
linux,code = <KEY_2>; linux,code = <KEY_2>;
gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
}; };
button@3 { button@3 {
debounce_interval = <50>; debounce_interval = <50>;
wakeup = <1>; wakeup-source;
label = "DSW2-3"; label = "DSW2-3";
linux,code = <KEY_3>; linux,code = <KEY_3>;
gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
}; };
button@4 { button@4 {
debounce_interval = <50>; debounce_interval = <50>;
wakeup = <1>; wakeup-source;
label = "DSW2-4"; label = "DSW2-4";
linux,code = <KEY_4>; linux,code = <KEY_4>;
gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
......
...@@ -47,35 +47,35 @@ ...@@ -47,35 +47,35 @@
button@1 { button@1 {
debounce_interval = <50>; debounce_interval = <50>;
wakeup = <1>; wakeup-source;
linux,code = <2>; linux,code = <2>;
label = "userpb"; label = "userpb";
gpios = <&gpio1 0 0x4>; gpios = <&gpio1 0 0x4>;
}; };
button@2 { button@2 {
debounce_interval = <50>; debounce_interval = <50>;
wakeup = <1>; wakeup-source;
linux,code = <3>; linux,code = <3>;
label = "extkb1"; label = "extkb1";
gpios = <&gpio4 23 0x4>; gpios = <&gpio4 23 0x4>;
}; };
button@3 { button@3 {
debounce_interval = <50>; debounce_interval = <50>;
wakeup = <1>; wakeup-source;
linux,code = <4>; linux,code = <4>;
label = "extkb2"; label = "extkb2";
gpios = <&gpio4 24 0x4>; gpios = <&gpio4 24 0x4>;
}; };
button@4 { button@4 {
debounce_interval = <50>; debounce_interval = <50>;
wakeup = <1>; wakeup-source;
linux,code = <5>; linux,code = <5>;
label = "extkb3"; label = "extkb3";
gpios = <&gpio5 1 0x4>; gpios = <&gpio5 1 0x4>;
}; };
button@5 { button@5 {
debounce_interval = <50>; debounce_interval = <50>;
wakeup = <1>; wakeup-source;
linux,code = <6>; linux,code = <6>;
label = "extkb4"; label = "extkb4";
gpios = <&gpio5 2 0x4>; gpios = <&gpio5 2 0x4>;
......
...@@ -61,42 +61,42 @@ ...@@ -61,42 +61,42 @@
button@1 { button@1 {
debounce_interval = <50>; debounce_interval = <50>;
wakeup = <1>; wakeup-source;
linux,code = <116>; linux,code = <116>;
label = "POWER"; label = "POWER";
gpios = <&iofpga_gpio0 0 0x4>; gpios = <&iofpga_gpio0 0 0x4>;
}; };
button@2 { button@2 {
debounce_interval = <50>; debounce_interval = <50>;
wakeup = <1>; wakeup-source;
linux,code = <102>; linux,code = <102>;
label = "HOME"; label = "HOME";
gpios = <&iofpga_gpio0 1 0x4>; gpios = <&iofpga_gpio0 1 0x4>;
}; };
button@3 { button@3 {
debounce_interval = <50>; debounce_interval = <50>;
wakeup = <1>; wakeup-source;
linux,code = <152>; linux,code = <152>;
label = "RLOCK"; label = "RLOCK";
gpios = <&iofpga_gpio0 2 0x4>; gpios = <&iofpga_gpio0 2 0x4>;
}; };
button@4 { button@4 {
debounce_interval = <50>; debounce_interval = <50>;
wakeup = <1>; wakeup-source;
linux,code = <115>; linux,code = <115>;
label = "VOL+"; label = "VOL+";
gpios = <&iofpga_gpio0 3 0x4>; gpios = <&iofpga_gpio0 3 0x4>;
}; };
button@5 { button@5 {
debounce_interval = <50>; debounce_interval = <50>;
wakeup = <1>; wakeup-source;
linux,code = <114>; linux,code = <114>;
label = "VOL-"; label = "VOL-";
gpios = <&iofpga_gpio0 4 0x4>; gpios = <&iofpga_gpio0 4 0x4>;
}; };
button@6 { button@6 {
debounce_interval = <50>; debounce_interval = <50>;
wakeup = <1>; wakeup-source;
linux,code = <99>; linux,code = <99>;
label = "NMI"; label = "NMI";
gpios = <&iofpga_gpio0 5 0x4>; gpios = <&iofpga_gpio0 5 0x4>;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册