Skip to content

L
linux
Commit 26cefdd1 authored by Sudeep Holla's avatar Sudeep Holla Committed by Shawn Guo
2 Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 39 deletions
arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
View file @ 26cefdd1
...@@ -30,7 +30,7 @@ bp1 { ...@@ -30,7 +30,7 @@ bp1 {
label = "BP1"; label = "BP1";
gpios = <&gpio3 18 GPIO_ACTIVE_LOW>; gpios = <&gpio3 18 GPIO_ACTIVE_LOW>;
linux,code = <BTN_MISC>; linux,code = <BTN_MISC>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/imx28-apf28dev.dts
View file @ 26cefdd1
...@@ -225,7 +225,7 @@ user-button { ...@@ -225,7 +225,7 @@ user-button {
label = "User button"; label = "User button";
gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
linux,code = <0x100>; linux,code = <0x100>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
}; };
arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi
View file @ 26cefdd1
...@@ -36,7 +36,7 @@ sw3 { ...@@ -36,7 +36,7 @@ sw3 {
label = "SW3"; label = "SW3";
gpios = <&gpio1 21 GPIO_ACTIVE_LOW>; gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
linux,code = <BTN_MISC>; linux,code = <BTN_MISC>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
...@@ -49,7 +49,7 @@ sw4 { ...@@ -49,7 +49,7 @@ sw4 {
label = "SW4"; label = "SW4";
gpios = <&gpio1 20 GPIO_ACTIVE_LOW>; gpios = <&gpio1 20 GPIO_ACTIVE_LOW>;
linux,code = <BTN_MISC>; linux,code = <BTN_MISC>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/imx28-tx28.dts
View file @ 26cefdd1
...@@ -202,7 +202,7 @@ &gpio5 7 GPIO_ACTIVE_HIGH ...@@ -202,7 +202,7 @@ &gpio5 7 GPIO_ACTIVE_HIGH
0x02020049 /* row 2, col 2, KEY_KP9 */ 0x02020049 /* row 2, col 2, KEY_KP9 */
>; >;
gpio-activelow; gpio-activelow;
linux,wakeup; wakeup-source;
debounce-delay-ms = <100>; debounce-delay-ms = <100>;
col-scan-delay-us = <5000>; col-scan-delay-us = <5000>;
linux,no-autorepeat; linux,no-autorepeat;
......
arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
View file @ 26cefdd1
...@@ -30,7 +30,7 @@ bp1 { ...@@ -30,7 +30,7 @@ bp1 {
label = "BP1"; label = "BP1";
gpios = <&gpio3 25 GPIO_ACTIVE_LOW>; gpios = <&gpio3 25 GPIO_ACTIVE_LOW>;
linux,code = <BTN_MISC>; linux,code = <BTN_MISC>;
gpio-key,wakeup; wakeup-source;
linux,input-type = <1>; linux,input-type = <1>;
}; };
}; };
......
arch/arm/boot/dts/imx51-babbage.dts
View file @ 26cefdd1
...@@ -107,7 +107,7 @@ power { ...@@ -107,7 +107,7 @@ power {
label = "Power Button"; label = "Power Button";
gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
View file @ 26cefdd1
...@@ -156,7 +156,7 @@ &esdhc2 { ...@@ -156,7 +156,7 @@ &esdhc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_esdhc2>; pinctrl-0 = <&pinctrl_esdhc2>;
cap-sdio-irq; cap-sdio-irq;
enable-sdio-wakeup; wakeup-source;
keep-power-in-suspend; keep-power-in-suspend;
max-frequency = <50000000>; max-frequency = <50000000>;
no-1-8-v; no-1-8-v;
......
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
View file @ 26cefdd1
...@@ -41,7 +41,7 @@ button-1 { ...@@ -41,7 +41,7 @@ button-1 {
label = "BP1"; label = "BP1";
gpios = <&gpio3 31 GPIO_ACTIVE_LOW>; gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;
linux,code = <256>; linux,code = <256>;
gpio-key,wakeup; wakeup-source;
linux,input-type = <1>; linux,input-type = <1>;
}; };
}; };
......
arch/arm/boot/dts/imx53-ard.dts
View file @ 26cefdd1
...@@ -69,21 +69,21 @@ home { ...@@ -69,21 +69,21 @@ home {
label = "Home"; label = "Home";
gpios = <&gpio5 10 0>; gpios = <&gpio5 10 0>;
linux,code = <102>; /* KEY_HOME */ linux,code = <102>; /* KEY_HOME */
gpio-key,wakeup; wakeup-source;
}; };
back { back {
label = "Back"; label = "Back";
gpios = <&gpio5 11 0>; gpios = <&gpio5 11 0>;
linux,code = <158>; /* KEY_BACK */ linux,code = <158>; /* KEY_BACK */
gpio-key,wakeup; wakeup-source;
}; };
program { program {
label = "Program"; label = "Program";
gpios = <&gpio5 12 0>; gpios = <&gpio5 12 0>;
linux,code = <362>; /* KEY_PROGRAM */ linux,code = <362>; /* KEY_PROGRAM */
gpio-key,wakeup; wakeup-source;
}; };
volume-up { volume-up {
......
arch/arm/boot/dts/imx53-qsb-common.dtsi
View file @ 26cefdd1
...@@ -67,14 +67,14 @@ volume-up { ...@@ -67,14 +67,14 @@ volume-up {
label = "Volume Up"; label = "Volume Up";
gpios = <&gpio2 14 0>; gpios = <&gpio2 14 0>;
linux,code = <115>; /* KEY_VOLUMEUP */ linux,code = <115>; /* KEY_VOLUMEUP */
gpio-key,wakeup; wakeup-source;
}; };
volume-down { volume-down {
label = "Volume Down"; label = "Volume Down";
gpios = <&gpio2 15 0>; gpios = <&gpio2 15 0>;
linux,code = <114>; /* KEY_VOLUMEDOWN */ linux,code = <114>; /* KEY_VOLUMEDOWN */
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/imx53-tx53-x03x.dts
View file @ 26cefdd1
...@@ -231,7 +231,7 @@ touchscreen: tsc2007@48 { ...@@ -231,7 +231,7 @@ touchscreen: tsc2007@48 {
interrupts = <26 0>; interrupts = <26 0>;
gpios = <&gpio3 26 GPIO_ACTIVE_LOW>; gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
ti,x-plate-ohms = <660>; ti,x-plate-ohms = <660>;
linux,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/imx53-tx53-x13x.dts
View file @ 26cefdd1
...@@ -101,7 +101,7 @@ touchscreen2: eeti@04 { ...@@ -101,7 +101,7 @@ touchscreen2: eeti@04 {
interrupt-parent = <&gpio3>; interrupt-parent = <&gpio3>;
interrupts = <23 0>; interrupts = <23 0>;
wakeup-gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>; wakeup-gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
linux,wakeup; wakeup-source;
}; };
}; };
...@@ -126,7 +126,7 @@ touchscreen1: eeti@04 { ...@@ -126,7 +126,7 @@ touchscreen1: eeti@04 {
interrupt-parent = <&gpio3>; interrupt-parent = <&gpio3>;
interrupts = <22 0>; interrupts = <22 0>;
wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
linux,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/imx53-tx53.dtsi
View file @ 26cefdd1
...@@ -50,7 +50,7 @@ power { ...@@ -50,7 +50,7 @@ power {
label = "Power Button"; label = "Power Button";
gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>; gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;
linux,code = <116>; /* KEY_POWER */ linux,code = <116>; /* KEY_POWER */
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/imx6dl-tx6u-811x.dts
View file @ 26cefdd1
...@@ -77,7 +77,7 @@ polytouch2: eeti@04 { ...@@ -77,7 +77,7 @@ polytouch2: eeti@04 {
interrupt-parent = <&gpio3>; interrupt-parent = <&gpio3>;
interrupts = <22 0>; interrupts = <22 0>;
wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
linux,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/imx6q-gk802.dts
View file @ 26cefdd1
...@@ -44,7 +44,7 @@ recovery-button { ...@@ -44,7 +44,7 @@ recovery-button {
label = "recovery"; label = "recovery";
gpios = <&gpio3 16 1>; gpios = <&gpio3 16 1>;
linux,code = <0x198>; /* KEY_RESTART */ linux,code = <0x198>; /* KEY_RESTART */
gpio-key,wakeup; wakeup-source;
}; };
}; };
}; };
......
arch/arm/boot/dts/imx6q-tx6q-1110.dts
View file @ 26cefdd1
...@@ -77,7 +77,7 @@ polytouch1: eeti@04 { ...@@ -77,7 +77,7 @@ polytouch1: eeti@04 {
interrupt-parent = <&gpio3>; interrupt-parent = <&gpio3>;
interrupts = <22 0>; interrupts = <22 0>;
wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
linux,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
View file @ 26cefdd1
...@@ -94,7 +94,7 @@ user-button { ...@@ -94,7 +94,7 @@ user-button {
label = "User button"; label = "User button";
gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
linux,code = <BTN_MISC>; linux,code = <BTN_MISC>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
View file @ 26cefdd1
...@@ -138,7 +138,7 @@ power { ...@@ -138,7 +138,7 @@ power {
label = "Power Button"; label = "Power Button";
gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpio-key,wakeup; wakeup-source;
}; };
menu { menu {
......
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
View file @ 26cefdd1
...@@ -119,7 +119,7 @@ power { ...@@ -119,7 +119,7 @@ power {
label = "Power Button"; label = "Power Button";
gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpio-key,wakeup; wakeup-source;
}; };
menu { menu {
......
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
View file @ 26cefdd1
...@@ -105,7 +105,7 @@ power { ...@@ -105,7 +105,7 @@ power {
label = "Power Button"; label = "Power Button";
gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpio-key,wakeup; wakeup-source;
}; };
menu { menu {
......
arch/arm/boot/dts/imx6qdl-sabresd.dtsi
View file @ 26cefdd1
...@@ -79,21 +79,21 @@ gpio-keys { ...@@ -79,21 +79,21 @@ gpio-keys {
power { power {
label = "Power Button"; label = "Power Button";
gpios = <&gpio3 29 GPIO_ACTIVE_LOW>; gpios = <&gpio3 29 GPIO_ACTIVE_LOW>;
gpio-key,wakeup; wakeup-source;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
}; };
volume-up { volume-up {
label = "Volume Up"; label = "Volume Up";
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
gpio-key,wakeup; wakeup-source;
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
}; };
volume-down { volume-down {
label = "Volume Down"; label = "Volume Down";
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
gpio-key,wakeup; wakeup-source;
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
}; };
}; };
......
arch/arm/boot/dts/imx6qdl-tx6.dtsi
View file @ 26cefdd1
...@@ -52,7 +52,7 @@ power { ...@@ -52,7 +52,7 @@ power {
label = "Power Button"; label = "Power Button";
gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>; gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
...@@ -276,7 +276,7 @@ polytouch: edt-ft5x06@38 { ...@@ -276,7 +276,7 @@ polytouch: edt-ft5x06@38 {
interrupts = <15 IRQ_TYPE_EDGE_FALLING>; interrupts = <15 IRQ_TYPE_EDGE_FALLING>;
reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>; reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>;
wake-gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>; wake-gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
linux,wakeup; wakeup-source;
}; };
touchscreen: tsc2007@48 { touchscreen: tsc2007@48 {
...@@ -288,7 +288,7 @@ touchscreen: tsc2007@48 { ...@@ -288,7 +288,7 @@ touchscreen: tsc2007@48 {
interrupts = <26 0>; interrupts = <26 0>;
gpios = <&gpio3 26 GPIO_ACTIVE_LOW>; gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
ti,x-plate-ohms = <660>; ti,x-plate-ohms = <660>;
linux,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/imx6sl-warp.dts
View file @ 26cefdd1
...@@ -118,7 +118,7 @@ &usdhc3 { ...@@ -118,7 +118,7 @@ &usdhc3 {
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;
keep-power-in-suspend; keep-power-in-suspend;
enable-sdio-wakeup; wakeup-source;
mmc-pwrseq = <&usdhc3_pwrseq>; mmc-pwrseq = <&usdhc3_pwrseq>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/imx6sx-sabreauto.dts
View file @ 26cefdd1
...@@ -52,7 +52,7 @@ &usdhc3 { ...@@ -52,7 +52,7 @@ &usdhc3 {
cd-gpios = <&gpio7 10 GPIO_ACTIVE_LOW>; cd-gpios = <&gpio7 10 GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; wp-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;
keep-power-in-suspend; keep-power-in-suspend;
enable-sdio-wakeup; wakeup-source;
vmmc-supply = <&vcc_sd3>; vmmc-supply = <&vcc_sd3>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/imx6sx-sdb.dtsi
View file @ 26cefdd1
...@@ -283,7 +283,7 @@ &usdhc2 { ...@@ -283,7 +283,7 @@ &usdhc2 {
non-removable; non-removable;
no-1-8-v; no-1-8-v;
keep-power-in-suspend; keep-power-in-suspend;
enable-sdio-wakeup; wakeup-source;
status = "okay"; status = "okay";
}; };
...@@ -296,7 +296,7 @@ &usdhc3 { ...@@ -296,7 +296,7 @@ &usdhc3 {
cd-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>; cd-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>; wp-gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>;
keep-power-in-suspend; keep-power-in-suspend;
enable-sdio-wakeup; wakeup-source;
vmmc-supply = <&vcc_sd3>; vmmc-supply = <&vcc_sd3>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/imx6ul-14x14-evk.dts
View file @ 26cefdd1
...@@ -131,7 +131,7 @@ &usdhc1 { ...@@ -131,7 +131,7 @@ &usdhc1 {
pinctrl-2 = <&pinctrl_usdhc1_200mhz>; pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>; cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
keep-power-in-suspend; keep-power-in-suspend;
enable-sdio-wakeup; wakeup-source;
vmmc-supply = <&reg_sd1_vmmc>; vmmc-supply = <&reg_sd1_vmmc>;
status = "okay"; status = "okay";
}; };
...@@ -141,7 +141,7 @@ &usdhc2 { ...@@ -141,7 +141,7 @@ &usdhc2 {
pinctrl-0 = <&pinctrl_usdhc2>; pinctrl-0 = <&pinctrl_usdhc2>;
no-1-8-v; no-1-8-v;
keep-power-in-suspend; keep-power-in-suspend;
enable-sdio-wakeup; wakeup-source;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/imx7d-sbc-imx7.dts
View file @ 26cefdd1
...@@ -22,7 +22,7 @@ &usdhc1 { ...@@ -22,7 +22,7 @@ &usdhc1 {
pinctrl-0 = <&pinctrl_usdhc1>; pinctrl-0 = <&pinctrl_usdhc1>;
cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; wp-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
enable-sdio-wakeup; wakeup-source;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/imx7d-sdb.dts
View file @ 26cefdd1
...@@ -296,7 +296,7 @@ &usdhc1 { ...@@ -296,7 +296,7 @@ &usdhc1 {
pinctrl-0 = <&pinctrl_usdhc1>; pinctrl-0 = <&pinctrl_usdhc1>;
cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; wp-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
enable-sdio-wakeup; wakeup-source;
keep-power-in-suspend; keep-power-in-suspend;
status = "okay"; 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7