ARM: dts: spear: 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 which is incorrect.
Since the presence of the boolean property indicates it is enabled,
value of "0" or "1" have no significance.

This patch replaces the legacy "gpio-key,wakeup" with the unified
"wakeup-source" property which inturn fixes the above mentioned issue.

Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/boot/dts/spear1310-evb.dts b/arch/arm/boot/dts/spear1310-evb.dts
index e48857249ce7bfc8a9440fa25d80c97460436697..84101e4eebbf88bc9e112627b1abb6345e2d7e80 100644 (file)
--- a/arch/arm/boot/dts/spear1310-evb.dts
+++ b/arch/arm/boot/dts/spear1310-evb.dts
@@ -161,7 +161,7 @@
                                linux,code = <0x100>;
                                gpios = <&gpio0 7 0x4>;
                                debounce-interval = <20>;
-                               gpio-key,wakeup = <1>;
+                               wakeup-source;
                        };
                };
 

diff --git a/arch/arm/boot/dts/spear1340-evb.dts b/arch/arm/boot/dts/spear1340-evb.dts
index c611f5606dfea5e2ba37ab5b0b57b7b73e0eed37..6565f3cb866f7d780795dacb29c727fd7c2805cf 100644 (file)
--- a/arch/arm/boot/dts/spear1340-evb.dts
+++ b/arch/arm/boot/dts/spear1340-evb.dts
@@ -223,7 +223,7 @@
                                linux,code = <0x100>;
                                gpios = <&gpio1 1 0x4>;
                                debounce-interval = <20>;
-                               gpio-key,wakeup = <1>;
+                               wakeup-source;
                        };
                };
 

diff --git a/arch/arm/boot/dts/spear320-hmi.dts b/arch/arm/boot/dts/spear320-hmi.dts
index 0aa6fef5ce22631f33af77b7f4b6c05f91072000..0d0da1f65f0e68a23d038a11a91054f8f25022e0 100644 (file)
--- a/arch/arm/boot/dts/spear320-hmi.dts
+++ b/arch/arm/boot/dts/spear320-hmi.dts
@@ -141,7 +141,7 @@
                                linux,code = <0x100>;
                                gpios = <&stmpegpio 3 0x4>;
                                debounce-interval = <20>;
-                               gpio-key,wakeup = <1>;
+                               wakeup-source;
                        };
 
                        button@2 {
@@ -149,7 +149,7 @@
                                linux,code = <0x200>;
                                gpios = <&stmpegpio 2 0x4>;
                                debounce-interval = <20>;
-                               gpio-key,wakeup = <1>;
+                               wakeup-source;
                        };
                };