ARM: dts: omap: replace legacy *,wakeup property with wakeup-source

Though the keyboard and other driver will continue to support the legacy
"gpio-key,wakeup", "linux,wakeup" boolean property to enable the wakeup
source, "wakeup-source" is the new standard binding.

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

Cc: "Benoît Cousson" <bcousson@baylibre.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
index b017871..d8dcbaf 100644 (file)
--- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
+++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
@@ -23,28 +23,28 @@
                        label = "sysboot2";
                        gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;     /* gpio2 */
                        linux,code = <BTN_0>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                sysboot5 {
                        label = "sysboot5";
                        gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;     /* gpio7 */
                        linux,code = <BTN_1>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                gpio1 {
                        label = "gpio1";
                        gpios = <&gpio6 21 GPIO_ACTIVE_LOW>;    /* gpio181 */
                        linux,code = <BTN_2>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                gpio2 {
                        label = "gpio2";
                        gpios = <&gpio6 18 GPIO_ACTIVE_LOW>;    /* gpio178 */
                        linux,code = <BTN_3>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };
 

diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index 5e0bf47..01e1e2d 100644 (file)
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -69,7 +69,7 @@
                        label = "user";
                        gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
                        linux,code = <0x114>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
        };

diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index 8dcf84a..8ba465d 100644 (file)
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -80,7 +80,7 @@
                        label = "user";
                        gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
                        linux,code = <0x114>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
        };

diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
index 8c813e7..e5f7f5c 100644 (file)
--- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
@@ -238,7 +238,7 @@
                ti,debounce-tol = /bits/ 16 <10>;
                ti,debounce-rep = /bits/ 16 <1>;
 
-               linux,wakeup;
+               wakeup-source;
        };
 };
 

diff --git a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
index 9ca2865..86850bb 100644 (file)
--- a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
+++ b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
@@ -64,7 +64,7 @@
                        label = "user";
                        gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
                        linux,code = <BTN_EXTRA>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };
 

diff --git a/arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi
index 4813e96..738910d 100644 (file)
--- a/arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi
+++ b/arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi
@@ -68,6 +68,6 @@
                ti,keep-vref-on = <1>;
                ti,settle-delay-usec = /bits/ 16 <150>;
 
-               linux,wakeup;
+               wakeup-source;
        };
 };

diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi
index e14d15e..5e2d643 100644 (file)
--- a/arch/arm/boot/dts/omap3-gta04.dtsi
+++ b/arch/arm/boot/dts/omap3-gta04.dtsi
@@ -37,7 +37,7 @@
                        label = "aux";
                        linux,code = <169>;
                        gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };
 

diff --git a/arch/arm/boot/dts/omap3-ldp.dts b/arch/arm/boot/dts/omap3-ldp.dts
index 0d0f1a7..5401630 100644 (file)
--- a/arch/arm/boot/dts/omap3-ldp.dts
+++ b/arch/arm/boot/dts/omap3-ldp.dts
@@ -35,63 +35,63 @@
                        label = "enter";
                        gpios = <&gpio4 5 GPIO_ACTIVE_LOW>; /* gpio101 */
                        linux,code = <KEY_ENTER>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                key_f1 {
                        label = "f1";
                        gpios = <&gpio4 6 GPIO_ACTIVE_LOW>; /* gpio102 */
                        linux,code = <KEY_F1>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                key_f2 {
                        label = "f2";
                        gpios = <&gpio4 7 GPIO_ACTIVE_LOW>; /* gpio103 */
                        linux,code = <KEY_F2>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                key_f3 {
                        label = "f3";
                        gpios = <&gpio4 8 GPIO_ACTIVE_LOW>; /* gpio104 */
                        linux,code = <KEY_F3>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                key_f4 {
                        label = "f4";
                        gpios = <&gpio4 9 GPIO_ACTIVE_LOW>; /* gpio105 */
                        linux,code = <KEY_F4>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                key_left {
                        label = "left";
                        gpios = <&gpio4 10 GPIO_ACTIVE_LOW>; /* gpio106 */
                        linux,code = <KEY_LEFT>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                key_right {
                        label = "right";
                        gpios = <&gpio4 11 GPIO_ACTIVE_LOW>; /* gpio107 */
                        linux,code = <KEY_RIGHT>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                key_up {
                        label = "up";
                        gpios = <&gpio4 12 GPIO_ACTIVE_LOW>; /* gpio108 */
                        linux,code = <KEY_UP>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                key_down {
                        label = "down";
                        gpios = <&gpio4 13 GPIO_ACTIVE_LOW>; /* gpio109 */
                        linux,code = <KEY_DOWN>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };
 };

diff --git a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
index 57d7c93..93f8dfe 100644 (file)
--- a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
+++ b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
@@ -327,7 +327,7 @@
                ti,pressure-max = /bits/ 16 <255>;
                ti,swap-xy;
 
-               linux,wakeup;
+               wakeup-source;
        };
 };
 

diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index f8a20f3..74d8f7e 100644 (file)
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -67,28 +67,28 @@
                        gpios = <&gpio4 14 GPIO_ACTIVE_LOW>; /* 110 */
                        linux,input-type = <5>; /* EV_SW */
                        linux,code = <0x09>; /* SW_CAMERA_LENS_COVER */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                camera_focus {
                        label = "Camera Focus";
                        gpios = <&gpio3 4 GPIO_ACTIVE_LOW>; /* 68 */
                        linux,code = <0x210>; /* KEY_CAMERA_FOCUS */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                camera_capture {
                        label = "Camera Capture";
                        gpios = <&gpio3 5 GPIO_ACTIVE_LOW>; /* 69 */
                        linux,code = <0xd4>; /* KEY_CAMERA */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                lock_button {
                        label = "Lock Button";
                        gpios = <&gpio4 17 GPIO_ACTIVE_LOW>; /* 113 */
                        linux,code = <0x98>; /* KEY_SCREENLOCK */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                keypad_slide {
@@ -96,7 +96,7 @@
                        gpios = <&gpio3 7 GPIO_ACTIVE_LOW>; /* 71 */
                        linux,input-type = <5>; /* EV_SW */
                        linux,code = <0x0a>; /* SW_KEYPAD_SLIDE */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                proximity_sensor {

diff --git a/arch/arm/boot/dts/omap3-overo-alto35-common.dtsi b/arch/arm/boot/dts/omap3-overo-alto35-common.dtsi
index 7aae8fb..3b3a759 100644 (file)
--- a/arch/arm/boot/dts/omap3-overo-alto35-common.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-alto35-common.dtsi
@@ -48,7 +48,7 @@
                        label = "button0";
                        linux,code = <BTN_0>;
                        gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;            /* gpio_10 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };
 };

diff --git a/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi b/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi
index 17b82f8..7df2792 100644 (file)
--- a/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi
@@ -41,13 +41,13 @@
                        label = "button0";
                        linux,code = <BTN_0>;
                        gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;            /* gpio_23 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
                button1@14 {
                        label = "button1";
                        linux,code = <BTN_1>;
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;            /* gpio_14 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };
 };

diff --git a/arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi b/arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
index b09cedf..6314da2 100644 (file)
--- a/arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
@@ -161,6 +161,6 @@
                ti,x-plate-ohms = /bits/ 16 <180>;
                ti,pressure-max = /bits/ 16 <255>;
 
-               linux,wakeup;
+               wakeup-source;
        };
 };

diff --git a/arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi b/arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
index 5f97959..7e3fe85 100644 (file)
--- a/arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
@@ -172,7 +172,7 @@
                ti,x-plate-ohms = /bits/ 16 <180>;
                ti,pressure-max = /bits/ 16 <255>;
 
-               linux,wakeup;
+               wakeup-source;
        };
 };
 

diff --git a/arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi b/arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi
index 49d2254..250cc7f 100644 (file)
--- a/arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi
@@ -41,13 +41,13 @@
                        label = "button0";
                        linux,code = <BTN_0>;
                        gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;            /* gpio_23 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
                button1@14 {
                        label = "button1";
                        linux,code = <BTN_1>;
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;            /* gpio_14 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };
 };

diff --git a/arch/arm/boot/dts/omap3-overo-palo35-common.dtsi b/arch/arm/boot/dts/omap3-overo-palo35-common.dtsi
index 680d726..8df7ec3 100644 (file)
--- a/arch/arm/boot/dts/omap3-overo-palo35-common.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-palo35-common.dtsi
@@ -41,13 +41,13 @@
                        label = "button0";
                        linux,code = <BTN_0>;
                        gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;            /* gpio_23 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
                button1@14 {
                        label = "button1";
                        linux,code = <BTN_1>;
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;            /* gpio_14 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };
 };

diff --git a/arch/arm/boot/dts/omap3-overo-palo43-common.dtsi b/arch/arm/boot/dts/omap3-overo-palo43-common.dtsi
index 087aedf..0ea2c45 100644 (file)
--- a/arch/arm/boot/dts/omap3-overo-palo43-common.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-palo43-common.dtsi
@@ -41,13 +41,13 @@
                        label = "button0";
                        linux,code = <BTN_0>;
                        gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;            /* gpio_23 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
                button1@14 {
                        label = "button1";
                        linux,code = <BTN_1>;
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;            /* gpio_14 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };
 };

diff --git a/arch/arm/boot/dts/omap3-pandora-common.dtsi b/arch/arm/boot/dts/omap3-pandora-common.dtsi
index cfe140c..13e9d1f 100644 (file)
--- a/arch/arm/boot/dts/omap3-pandora-common.dtsi
+++ b/arch/arm/boot/dts/omap3-pandora-common.dtsi
@@ -84,112 +84,112 @@
                        label = "up";
                        linux,code = <KEY_UP>;
                        gpios = <&gpio4 14 GPIO_ACTIVE_LOW>;    /* GPIO_110 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                down-button {
                        label = "down";
                        linux,code = <KEY_DOWN>;
                        gpios = <&gpio4 7 GPIO_ACTIVE_LOW>;     /* GPIO_103 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                left-button {
                        label = "left";
                        linux,code = <KEY_LEFT>;
                        gpios = <&gpio4 0 GPIO_ACTIVE_LOW>;     /* GPIO_96 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                right-button {
                        label = "right";
                        linux,code = <KEY_RIGHT>;
                        gpios = <&gpio4 2 GPIO_ACTIVE_LOW>;     /* GPIO_98 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                pageup-button {
                        label = "game 1";
                        linux,code = <KEY_PAGEUP>;
                        gpios = <&gpio4 13 GPIO_ACTIVE_LOW>;    /* GPIO_109 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                pagedown-button {
                        label = "game 3";
                        linux,code = <KEY_PAGEDOWN>;
                        gpios = <&gpio4 10 GPIO_ACTIVE_LOW>;    /* GPIO_106 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                home-button {
                        label = "game 4";
                        linux,code = <KEY_HOME>;
                        gpios = <&gpio4 5 GPIO_ACTIVE_LOW>;     /* GPIO_101 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                end-button {
                        label = "game 2";
                        linux,code = <KEY_END>;
                        gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;    /* GPIO_111 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                right-shift {
                        label = "l";
                        linux,code = <KEY_RIGHTSHIFT>;
                        gpios = <&gpio4 6 GPIO_ACTIVE_LOW>;     /* GPIO_102 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                kp-plus {
                        label = "l2";
                        linux,code = <KEY_KPPLUS>;
                        gpios = <&gpio4 1 GPIO_ACTIVE_LOW>;     /* GPIO_97 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                right-ctrl {
                        label = "r";
                        linux,code = <KEY_RIGHTCTRL>;
                        gpios = <&gpio4 9 GPIO_ACTIVE_LOW>;     /* GPIO_105 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                kp-minus {
                        label = "r2";
                        linux,code = <KEY_KPMINUS>;
                        gpios = <&gpio4 11 GPIO_ACTIVE_LOW>;    /* GPIO_107 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                left-ctrl {
                        label = "ctrl";
                        linux,code = <KEY_LEFTCTRL>;
                        gpios = <&gpio4 8 GPIO_ACTIVE_LOW>;     /* GPIO_104 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                menu {
                        label = "menu";
                        linux,code = <KEY_MENU>;
                        gpios = <&gpio4 3 GPIO_ACTIVE_LOW>;     /* GPIO_99 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                hold {
                        label = "hold";
                        linux,code = <KEY_COFFEE>;
                        gpios = <&gpio6 16 GPIO_ACTIVE_LOW>;    /* GPIO_176 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                left-alt {
                        label = "alt";
                        linux,code = <KEY_LEFTALT>;
                        gpios = <&gpio4 4 GPIO_ACTIVE_HIGH>;    /* GPIO_100 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                lid {
@@ -617,7 +617,7 @@
                ti,x-plate-ohms = /bits/ 16 <40>;
                ti,pressure-max = /bits/ 16 <255>;
 
-               linux,wakeup;
+               wakeup-source;
        };
 
        lcd: lcd@1 {

diff --git a/arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi b/arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi
index f4b1a61..157345b 100644 (file)
--- a/arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi
+++ b/arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi
@@ -66,6 +66,6 @@
                ti,x-plate-ohms = /bits/ 16 <40>;
                ti,pressure-max = /bits/ 16 <255>;
                ti,swap-xy;
-               linux,wakeup;
+               wakeup-source;
        };
 };

diff --git a/arch/arm/boot/dts/omap4-duovero-parlor.dts b/arch/arm/boot/dts/omap4-duovero-parlor.dts
index 1a78f01..ab17b99 100644 (file)
--- a/arch/arm/boot/dts/omap4-duovero-parlor.dts
+++ b/arch/arm/boot/dts/omap4-duovero-parlor.dts
@@ -36,7 +36,7 @@
                        label = "button0";
                        linux,code = <BTN_0>;
                        gpios = <&gpio4 25 GPIO_ACTIVE_LOW>;    /* gpio_121 */
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };
 

diff --git a/arch/arm/boot/dts/omap4-var-om44customboard.dtsi b/arch/arm/boot/dts/omap4-var-om44customboard.dtsi
index f2d2fdb..6e278d7 100644 (file)
--- a/arch/arm/boot/dts/omap4-var-om44customboard.dtsi
+++ b/arch/arm/boot/dts/omap4-var-om44customboard.dtsi
@@ -41,7 +41,7 @@
                        label = "user";
                        gpios = <&gpio6 24 GPIO_ACTIVE_HIGH>; /* gpio 184 */
                        linux,code = <BTN_EXTRA>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };
 

diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts
index 0c03dca..ecc591d 100644 (file)
--- a/arch/arm/boot/dts/omap5-cm-t54.dts
+++ b/arch/arm/boot/dts/omap5-cm-t54.dts
@@ -359,7 +359,7 @@
                ti,debounce-tol = /bits/ 16 <10>;
                ti,debounce-rep = /bits/ 16 <1>;
 
-               linux,wakeup;
+               wakeup-source;
        };
 };