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: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
index 8a58bb3d7b6b0bdff7b7e64bdf9ceaca451fdd37..6d2a5b3a84a86635f65b8d43aae475040dc54c4e 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
+++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
@@ -86,7 +86,7 @@
                        linux,code = <116>;
                        label = "GPIO Key Power";
                        linux,input-type = <1>;
-                       gpio-key,wakeup = <1>;
+                       wakeup-source;
                        debounce-interval = <100>;
                };
                button@1 {
@@ -94,7 +94,6 @@
                        linux,code = <104>;
                        label = "GPIO Key Vol-";
                        linux,input-type = <1>;
-                       gpio-key,wakeup = <0>;
                        debounce-interval = <100>;
                };
                /* VOL+ comes somehow thru the ADC */

diff --git a/arch/arm/boot/dts/rk3066a-rayeager.dts b/arch/arm/boot/dts/rk3066a-rayeager.dts
index 84f44f5ee3de99b573f91819e2771f89633d5fb2..05533005a809cef3d40731a2f3b4d1477a531d26 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-rayeager.dts
+++ b/arch/arm/boot/dts/rk3066a-rayeager.dts
@@ -65,7 +65,7 @@
                #size-cells = <0>;
 
                button@0 {
-                       gpio-key,wakeup = <1>;
+                       wakeup-source;
                        gpios = <&gpio6 2 GPIO_ACTIVE_LOW>;
                        label = "GPIO Power";
                        linux,code = <116>;

diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts
index 66fa87d1e2c2492f247b703fce10d3b34f2076e9..0b6924c97b6bf0fd40e6062ac0b279e2edaea7a2 100644 (file)
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@ -63,7 +63,7 @@
                        linux,code = <116>;
                        label = "GPIO Key Power";
                        linux,input-type = <1>;
-                       gpio-key,wakeup = <1>;
+                       wakeup-source;
                        debounce-interval = <100>;
                };
        };

diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index 4faabdb65868e38c0e4f96143d4a3cd5370afe5e..78d47f7d2938532d435954c731ba7e99063939c2 100644 (file)
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -110,7 +110,7 @@
                        linux,code = <116>;
                        label = "GPIO Key Power";
                        linux,input-type = <1>;
-                       gpio-key,wakeup = <1>;
+                       wakeup-source;
                        debounce-interval = <100>;
                };
        };

diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index 49ec20d24082d64b1168769d0d002dd98afc1b92..98c586a43c73011f3aba567c784f573b8ab57dab 100644 (file)
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -91,7 +91,7 @@
                #size-cells = <0>;
 
                button@0 {
-                       gpio-key,wakeup = <1>;
+                       wakeup-source;
                        gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
                        label = "GPIO Power";
                        linux,code = <116>;

diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts
index 65c475642d5a79196925a50498a567aad75f72ef..2ff9689d2e1b831c26f8e5660ee910ad2c18e6c6 100644 (file)
--- a/arch/arm/boot/dts/rk3288-popmetal.dts
+++ b/arch/arm/boot/dts/rk3288-popmetal.dts
@@ -74,7 +74,7 @@
                        linux,code = <116>;
                        label = "GPIO Key Power";
                        linux,input-type = <1>;
-                       gpio-key,wakeup = <1>;
+                       wakeup-source;
                        debounce-interval = <100>;
                };
        };

diff --git a/arch/arm/boot/dts/rk3288-r89.dts b/arch/arm/boot/dts/rk3288-r89.dts
index 17f13c73fe5e078e1adebbd1932615d41b89bbcb..510a1d0d7abb5b4022c4e2b7500d9049540a1ec3 100644 (file)
--- a/arch/arm/boot/dts/rk3288-r89.dts
+++ b/arch/arm/boot/dts/rk3288-r89.dts
@@ -73,7 +73,7 @@
                        linux,code = <116>;
                        label = "GPIO Key Power";
                        linux,input-type = <1>;
-                       gpio-key,wakeup = <1>;
+                       wakeup-source;
                        debounce-interval = <100>;
                };
        };

diff --git a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
index 136d650dd05faf28b5656ea980b2b799edc06ba8..610769d99522ea47e1765282469b797d378dc5c8 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
@@ -108,7 +108,7 @@
        lid {
                label = "Lid";
                gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
-               gpio-key,wakeup;
+               wakeup-source;
                linux,code = <0>; /* SW_LID */
                linux,input-type = <5>; /* EV_SW */
                debounce-interval = <1>;

diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
index 5e61f07724d42a5e6c40e41d8f5f72029feec3de..0350f79f57da075d8c58757d7224a1766edff892 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
@@ -64,7 +64,7 @@
                        gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                        debounce-interval = <100>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };