ARM: dts: shmobile/r8a7xxx: replace gpio-key, wakeup with wakeup-source property

Though the keyboard driver for GPIO buttons(gpio-keys) will continue to
check for/support the legacy "gpio-key,wakeup" boolean property to
enable gpio buttons as wakeup source, "wakeup-source" is the new
standard binding.

This patch replaces the legacy "gpio-key,wakeup" with the unified
"wakeup-source" property in order to avoid any futher copy-paste
duplication.

Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm.dts b/arch/arm/boot/dts/r8a73a4-ape6evm.dts
index a4c425923c05e8cdeff90843a2407eb8884a2bfb..9b7eabd3eba3509c433f63adf8283cd1da52a333 100644 (file)
--- a/arch/arm/boot/dts/r8a73a4-ape6evm.dts
+++ b/arch/arm/boot/dts/r8a73a4-ape6evm.dts
@@ -110,7 +110,7 @@
                        gpios = <&pfc 324 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_0>;
                        label = "S16";
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                menu-key {

diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
index 105d9c95de4af6114c091027a50e393aac147b09..78a21f2828dff6d1cbafa9139b12791d4840936d 100644 (file)
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
@@ -85,7 +85,7 @@
                        gpios = <&pfc 99 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                        label = "SW3";
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                back-key {

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index c553abd711eeb3813f786ad7a95bafc76502ee1c..e2174d816e78c127562fb32774fa78b5320e0e20 100644 (file)
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -77,28 +77,28 @@
                button@1 {
                        linux,code = <KEY_1>;
                        label = "SW2-1";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
                };
                button@2 {
                        linux,code = <KEY_2>;
                        label = "SW2-2";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                        gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
                };
                button@3 {
                        linux,code = <KEY_3>;
                        label = "SW2-3";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                        gpios = <&gpio1 26 GPIO_ACTIVE_LOW>;
                };
                button@4 {
                        linux,code = <KEY_4>;
                        label = "SW2-4";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                        gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;
                };

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index fc44ea361a4b72bc89b046c759a1ec78a077ff10..98da99d1b7dc106ec20d38c6717cff3a6a367ab0 100644 (file)
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -79,77 +79,77 @@
                        gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_1>;
                        label = "SW2-1";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-2 {
                        gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_2>;
                        label = "SW2-2";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-3 {
                        gpios = <&gpio5 2 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_3>;
                        label = "SW2-3";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-4 {
                        gpios = <&gpio5 3 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_4>;
                        label = "SW2-4";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-a {
                        gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_A>;
                        label = "SW30";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-b {
                        gpios = <&gpio7 1 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_B>;
                        label = "SW31";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-c {
                        gpios = <&gpio7 2 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_C>;
                        label = "SW32";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-d {
                        gpios = <&gpio7 3 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_D>;
                        label = "SW33";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-e {
                        gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_E>;
                        label = "SW34";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-f {
                        gpios = <&gpio7 5 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_F>;
                        label = "SW35";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-g {
                        gpios = <&gpio7 6 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_G>;
                        label = "SW36";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
        };

diff --git a/arch/arm/boot/dts/sh73a0-kzm9g.dts b/arch/arm/boot/dts/sh73a0-kzm9g.dts
index 7fc5602810ad0da1d55a776a1fad926f1e332194..aa8bae3b8fcff6d63f56be37fde528350cf39049 100644 (file)
--- a/arch/arm/boot/dts/sh73a0-kzm9g.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g.dts
@@ -147,7 +147,7 @@
                        gpios = <&pcf8575 14 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_HOME>;
                        label = "SW1";
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };