Commit 4f66f247 authored by Sudeep Holla's avatar Sudeep Holla Committed by Heiko Stuebner

ARM: dts: rockchip: replace gpio-key,wakeup with wakeup-source property

Keyboard driver for GPIO buttons(gpio-keys) checks for the legacy
"gpio-key,wakeup" boolean property to enable gpio buttons as wakeup
source.

Few dts files assign value "1" to gpio-key,wakeup and in one instance a
value "0" is assigned probably assuming it won't be enabled as a wakeup
source. Since the presence of the boolean property indicates it is
enabled, value of "0" have no value.

This patch replaces the legacy "gpio-key,wakeup" with the unified
"wakeup-source" property which inturn fixes the above mentioned issue.
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 29f12bba
...@@ -86,7 +86,7 @@ button@0 { ...@@ -86,7 +86,7 @@ button@0 {
linux,code = <116>; linux,code = <116>;
label = "GPIO Key Power"; label = "GPIO Key Power";
linux,input-type = <1>; linux,input-type = <1>;
gpio-key,wakeup = <1>; wakeup-source;
debounce-interval = <100>; debounce-interval = <100>;
}; };
button@1 { button@1 {
...@@ -94,7 +94,6 @@ button@1 { ...@@ -94,7 +94,6 @@ button@1 {
linux,code = <104>; linux,code = <104>;
label = "GPIO Key Vol-"; label = "GPIO Key Vol-";
linux,input-type = <1>; linux,input-type = <1>;
gpio-key,wakeup = <0>;
debounce-interval = <100>; debounce-interval = <100>;
}; };
/* VOL+ comes somehow thru the ADC */ /* VOL+ comes somehow thru the ADC */
......
...@@ -65,7 +65,7 @@ keys: gpio-keys { ...@@ -65,7 +65,7 @@ keys: gpio-keys {
#size-cells = <0>; #size-cells = <0>;
button@0 { button@0 {
gpio-key,wakeup = <1>; wakeup-source;
gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; gpios = <&gpio6 2 GPIO_ACTIVE_LOW>;
label = "GPIO Power"; label = "GPIO Power";
linux,code = <116>; linux,code = <116>;
......
...@@ -63,7 +63,7 @@ button@0 { ...@@ -63,7 +63,7 @@ button@0 {
linux,code = <116>; linux,code = <116>;
label = "GPIO Key Power"; label = "GPIO Key Power";
linux,input-type = <1>; linux,input-type = <1>;
gpio-key,wakeup = <1>; wakeup-source;
debounce-interval = <100>; debounce-interval = <100>;
}; };
}; };
......
...@@ -110,7 +110,7 @@ button@0 { ...@@ -110,7 +110,7 @@ button@0 {
linux,code = <116>; linux,code = <116>;
label = "GPIO Key Power"; label = "GPIO Key Power";
linux,input-type = <1>; linux,input-type = <1>;
gpio-key,wakeup = <1>; wakeup-source;
debounce-interval = <100>; debounce-interval = <100>;
}; };
}; };
......
...@@ -91,7 +91,7 @@ keys: gpio-keys { ...@@ -91,7 +91,7 @@ keys: gpio-keys {
#size-cells = <0>; #size-cells = <0>;
button@0 { button@0 {
gpio-key,wakeup = <1>; wakeup-source;
gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
label = "GPIO Power"; label = "GPIO Power";
linux,code = <116>; linux,code = <116>;
......
...@@ -74,7 +74,7 @@ button@0 { ...@@ -74,7 +74,7 @@ button@0 {
linux,code = <116>; linux,code = <116>;
label = "GPIO Key Power"; label = "GPIO Key Power";
linux,input-type = <1>; linux,input-type = <1>;
gpio-key,wakeup = <1>; wakeup-source;
debounce-interval = <100>; debounce-interval = <100>;
}; };
}; };
......
...@@ -73,7 +73,7 @@ button@0 { ...@@ -73,7 +73,7 @@ button@0 {
linux,code = <116>; linux,code = <116>;
label = "GPIO Key Power"; label = "GPIO Key Power";
linux,input-type = <1>; linux,input-type = <1>;
gpio-key,wakeup = <1>; wakeup-source;
debounce-interval = <100>; debounce-interval = <100>;
}; };
}; };
......
...@@ -108,7 +108,7 @@ &gpio_keys { ...@@ -108,7 +108,7 @@ &gpio_keys {
lid { lid {
label = "Lid"; label = "Lid";
gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
gpio-key,wakeup; wakeup-source;
linux,code = <0>; /* SW_LID */ linux,code = <0>; /* SW_LID */
linux,input-type = <5>; /* EV_SW */ linux,input-type = <5>; /* EV_SW */
debounce-interval = <1>; debounce-interval = <1>;
......
...@@ -64,7 +64,7 @@ power { ...@@ -64,7 +64,7 @@ power {
gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
debounce-interval = <100>; debounce-interval = <100>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment