Commit 26cefdd1 authored by Sudeep Holla's avatar Sudeep Holla Committed by Shawn Guo

ARM: dts: imx: replace legacy wakeup property with 'wakeup-source'

Though the keyboard and other driver will continue to support the legacy
"gpio-key,wakeup", "linux,wakeup" and "enable-sdio-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: Sascha Hauer <kernel@pengutronix.de>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 26a91d89
......@@ -30,7 +30,7 @@ bp1 {
label = "BP1";
gpios = <&gpio3 18 GPIO_ACTIVE_LOW>;
linux,code = <BTN_MISC>;
gpio-key,wakeup;
wakeup-source;
};
};
......
......@@ -225,7 +225,7 @@ user-button {
label = "User button";
gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
linux,code = <0x100>;
gpio-key,wakeup;
wakeup-source;
};
};
};
......@@ -36,7 +36,7 @@ sw3 {
label = "SW3";
gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
linux,code = <BTN_MISC>;
gpio-key,wakeup;
wakeup-source;
};
};
......@@ -49,7 +49,7 @@ sw4 {
label = "SW4";
gpios = <&gpio1 20 GPIO_ACTIVE_LOW>;
linux,code = <BTN_MISC>;
gpio-key,wakeup;
wakeup-source;
};
};
......
......@@ -202,7 +202,7 @@ &gpio5 7 GPIO_ACTIVE_HIGH
0x02020049 /* row 2, col 2, KEY_KP9 */
>;
gpio-activelow;
linux,wakeup;
wakeup-source;
debounce-delay-ms = <100>;
col-scan-delay-us = <5000>;
linux,no-autorepeat;
......
......@@ -30,7 +30,7 @@ bp1 {
label = "BP1";
gpios = <&gpio3 25 GPIO_ACTIVE_LOW>;
linux,code = <BTN_MISC>;
gpio-key,wakeup;
wakeup-source;
linux,input-type = <1>;
};
};
......
......@@ -107,7 +107,7 @@ power {
label = "Power Button";
gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_POWER>;
gpio-key,wakeup;
wakeup-source;
};
};
......
......@@ -156,7 +156,7 @@ &esdhc2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_esdhc2>;
cap-sdio-irq;
enable-sdio-wakeup;
wakeup-source;
keep-power-in-suspend;
max-frequency = <50000000>;
no-1-8-v;
......
......@@ -41,7 +41,7 @@ button-1 {
label = "BP1";
gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;
linux,code = <256>;
gpio-key,wakeup;
wakeup-source;
linux,input-type = <1>;
};
};
......
......@@ -69,21 +69,21 @@ home {
label = "Home";
gpios = <&gpio5 10 0>;
linux,code = <102>; /* KEY_HOME */
gpio-key,wakeup;
wakeup-source;
};
back {
label = "Back";
gpios = <&gpio5 11 0>;
linux,code = <158>; /* KEY_BACK */
gpio-key,wakeup;
wakeup-source;
};
program {
label = "Program";
gpios = <&gpio5 12 0>;
linux,code = <362>; /* KEY_PROGRAM */
gpio-key,wakeup;
wakeup-source;
};
volume-up {
......
......@@ -67,14 +67,14 @@ volume-up {
label = "Volume Up";
gpios = <&gpio2 14 0>;
linux,code = <115>; /* KEY_VOLUMEUP */
gpio-key,wakeup;
wakeup-source;
};
volume-down {
label = "Volume Down";
gpios = <&gpio2 15 0>;
linux,code = <114>; /* KEY_VOLUMEDOWN */
gpio-key,wakeup;
wakeup-source;
};
};
......
......@@ -231,7 +231,7 @@ touchscreen: tsc2007@48 {
interrupts = <26 0>;
gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
ti,x-plate-ohms = <660>;
linux,wakeup;
wakeup-source;
};
};
......
......@@ -101,7 +101,7 @@ touchscreen2: eeti@04 {
interrupt-parent = <&gpio3>;
interrupts = <23 0>;
wakeup-gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
linux,wakeup;
wakeup-source;
};
};
......@@ -126,7 +126,7 @@ touchscreen1: eeti@04 {
interrupt-parent = <&gpio3>;
interrupts = <22 0>;
wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
linux,wakeup;
wakeup-source;
};
};
......
......@@ -50,7 +50,7 @@ power {
label = "Power Button";
gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;
linux,code = <116>; /* KEY_POWER */
gpio-key,wakeup;
wakeup-source;
};
};
......
......@@ -77,7 +77,7 @@ polytouch2: eeti@04 {
interrupt-parent = <&gpio3>;
interrupts = <22 0>;
wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
linux,wakeup;
wakeup-source;
};
};
......
......@@ -44,7 +44,7 @@ recovery-button {
label = "recovery";
gpios = <&gpio3 16 1>;
linux,code = <0x198>; /* KEY_RESTART */
gpio-key,wakeup;
wakeup-source;
};
};
};
......
......@@ -77,7 +77,7 @@ polytouch1: eeti@04 {
interrupt-parent = <&gpio3>;
interrupts = <22 0>;
wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
linux,wakeup;
wakeup-source;
};
};
......
......@@ -94,7 +94,7 @@ user-button {
label = "User button";
gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
linux,code = <BTN_MISC>;
gpio-key,wakeup;
wakeup-source;
};
};
......
......@@ -138,7 +138,7 @@ power {
label = "Power Button";
gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
gpio-key,wakeup;
wakeup-source;
};
menu {
......
......@@ -119,7 +119,7 @@ power {
label = "Power Button";
gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
gpio-key,wakeup;
wakeup-source;
};
menu {
......
......@@ -105,7 +105,7 @@ power {
label = "Power Button";
gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
gpio-key,wakeup;
wakeup-source;
};
menu {
......
......@@ -79,21 +79,21 @@ gpio-keys {
power {
label = "Power Button";
gpios = <&gpio3 29 GPIO_ACTIVE_LOW>;
gpio-key,wakeup;
wakeup-source;
linux,code = <KEY_POWER>;
};
volume-up {
label = "Volume Up";
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
gpio-key,wakeup;
wakeup-source;
linux,code = <KEY_VOLUMEUP>;
};
volume-down {
label = "Volume Down";
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
gpio-key,wakeup;
wakeup-source;
linux,code = <KEY_VOLUMEDOWN>;
};
};
......
......@@ -52,7 +52,7 @@ power {
label = "Power Button";
gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_POWER>;
gpio-key,wakeup;
wakeup-source;
};
};
......@@ -276,7 +276,7 @@ polytouch: edt-ft5x06@38 {
interrupts = <15 IRQ_TYPE_EDGE_FALLING>;
reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>;
wake-gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
linux,wakeup;
wakeup-source;
};
touchscreen: tsc2007@48 {
......@@ -288,7 +288,7 @@ touchscreen: tsc2007@48 {
interrupts = <26 0>;
gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
ti,x-plate-ohms = <660>;
linux,wakeup;
wakeup-source;
};
};
......
......@@ -118,7 +118,7 @@ &usdhc3 {
bus-width = <4>;
non-removable;
keep-power-in-suspend;
enable-sdio-wakeup;
wakeup-source;
mmc-pwrseq = <&usdhc3_pwrseq>;
status = "okay";
};
......
......@@ -52,7 +52,7 @@ &usdhc3 {
cd-gpios = <&gpio7 10 GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;
keep-power-in-suspend;
enable-sdio-wakeup;
wakeup-source;
vmmc-supply = <&vcc_sd3>;
status = "okay";
};
......
......@@ -283,7 +283,7 @@ &usdhc2 {
non-removable;
no-1-8-v;
keep-power-in-suspend;
enable-sdio-wakeup;
wakeup-source;
status = "okay";
};
......@@ -296,7 +296,7 @@ &usdhc3 {
cd-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>;
keep-power-in-suspend;
enable-sdio-wakeup;
wakeup-source;
vmmc-supply = <&vcc_sd3>;
status = "okay";
};
......
......@@ -131,7 +131,7 @@ &usdhc1 {
pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
keep-power-in-suspend;
enable-sdio-wakeup;
wakeup-source;
vmmc-supply = <&reg_sd1_vmmc>;
status = "okay";
};
......@@ -141,7 +141,7 @@ &usdhc2 {
pinctrl-0 = <&pinctrl_usdhc2>;
no-1-8-v;
keep-power-in-suspend;
enable-sdio-wakeup;
wakeup-source;
status = "okay";
};
......
......@@ -22,7 +22,7 @@ &usdhc1 {
pinctrl-0 = <&pinctrl_usdhc1>;
cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
enable-sdio-wakeup;
wakeup-source;
status = "okay";
};
......
......@@ -296,7 +296,7 @@ &usdhc1 {
pinctrl-0 = <&pinctrl_usdhc1>;
cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
enable-sdio-wakeup;
wakeup-source;
keep-power-in-suspend;
status = "okay";
};
......
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