tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Sudeep Holla and committed by
Shawn Guo 26cefdd1 26a91d89

+39 -39
+1 -1
arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
··· 30 30 label = "BP1"; 31 31 gpios = <&gpio3 18 GPIO_ACTIVE_LOW>; 32 32 linux,code = <BTN_MISC>; 33 - gpio-key,wakeup; 33 + wakeup-source; 34 34 }; 35 35 }; 36 36
+1 -1
arch/arm/boot/dts/imx28-apf28dev.dts
··· 225 225 label = "User button"; 226 226 gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; 227 227 linux,code = <0x100>; 228 - gpio-key,wakeup; 228 + wakeup-source; 229 229 }; 230 230 }; 231 231 };
+2 -2
arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi
··· 36 36 label = "SW3"; 37 37 gpios = <&gpio1 21 GPIO_ACTIVE_LOW>; 38 38 linux,code = <BTN_MISC>; 39 - gpio-key,wakeup; 39 + wakeup-source; 40 40 }; 41 41 }; 42 42 ··· 49 49 label = "SW4"; 50 50 gpios = <&gpio1 20 GPIO_ACTIVE_LOW>; 51 51 linux,code = <BTN_MISC>; 52 - gpio-key,wakeup; 52 + wakeup-source; 53 53 }; 54 54 }; 55 55
+1 -1
arch/arm/boot/dts/imx28-tx28.dts
··· 202 202 0x02020049 /* row 2, col 2, KEY_KP9 */ 203 203 >; 204 204 gpio-activelow; 205 - linux,wakeup; 205 + wakeup-source; 206 206 debounce-delay-ms = <100>; 207 207 col-scan-delay-us = <5000>; 208 208 linux,no-autorepeat;
+1 -1
arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
··· 30 30 label = "BP1"; 31 31 gpios = <&gpio3 25 GPIO_ACTIVE_LOW>; 32 32 linux,code = <BTN_MISC>; 33 - gpio-key,wakeup; 33 + wakeup-source; 34 34 linux,input-type = <1>; 35 35 }; 36 36 };
+1 -1
arch/arm/boot/dts/imx51-babbage.dts
··· 107 107 label = "Power Button"; 108 108 gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>; 109 109 linux,code = <KEY_POWER>; 110 - gpio-key,wakeup; 110 + wakeup-source; 111 111 }; 112 112 }; 113 113
+1 -1
arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
··· 156 156 pinctrl-names = "default"; 157 157 pinctrl-0 = <&pinctrl_esdhc2>; 158 158 cap-sdio-irq; 159 - enable-sdio-wakeup; 159 + wakeup-source; 160 160 keep-power-in-suspend; 161 161 max-frequency = <50000000>; 162 162 no-1-8-v;
+1 -1
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
··· 41 41 label = "BP1"; 42 42 gpios = <&gpio3 31 GPIO_ACTIVE_LOW>; 43 43 linux,code = <256>; 44 - gpio-key,wakeup; 44 + wakeup-source; 45 45 linux,input-type = <1>; 46 46 }; 47 47 };
+3 -3
arch/arm/boot/dts/imx53-ard.dts
··· 69 69 label = "Home"; 70 70 gpios = <&gpio5 10 0>; 71 71 linux,code = <102>; /* KEY_HOME */ 72 - gpio-key,wakeup; 72 + wakeup-source; 73 73 }; 74 74 75 75 back { 76 76 label = "Back"; 77 77 gpios = <&gpio5 11 0>; 78 78 linux,code = <158>; /* KEY_BACK */ 79 - gpio-key,wakeup; 79 + wakeup-source; 80 80 }; 81 81 82 82 program { 83 83 label = "Program"; 84 84 gpios = <&gpio5 12 0>; 85 85 linux,code = <362>; /* KEY_PROGRAM */ 86 - gpio-key,wakeup; 86 + wakeup-source; 87 87 }; 88 88 89 89 volume-up {
+2 -2
arch/arm/boot/dts/imx53-qsb-common.dtsi
··· 67 67 label = "Volume Up"; 68 68 gpios = <&gpio2 14 0>; 69 69 linux,code = <115>; /* KEY_VOLUMEUP */ 70 - gpio-key,wakeup; 70 + wakeup-source; 71 71 }; 72 72 73 73 volume-down { 74 74 label = "Volume Down"; 75 75 gpios = <&gpio2 15 0>; 76 76 linux,code = <114>; /* KEY_VOLUMEDOWN */ 77 - gpio-key,wakeup; 77 + wakeup-source; 78 78 }; 79 79 }; 80 80
+1 -1
arch/arm/boot/dts/imx53-tx53-x03x.dts
··· 231 231 interrupts = <26 0>; 232 232 gpios = <&gpio3 26 GPIO_ACTIVE_LOW>; 233 233 ti,x-plate-ohms = <660>; 234 - linux,wakeup; 234 + wakeup-source; 235 235 }; 236 236 }; 237 237
+2 -2
arch/arm/boot/dts/imx53-tx53-x13x.dts
··· 101 101 interrupt-parent = <&gpio3>; 102 102 interrupts = <23 0>; 103 103 wakeup-gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>; 104 - linux,wakeup; 104 + wakeup-source; 105 105 }; 106 106 }; 107 107 ··· 126 126 interrupt-parent = <&gpio3>; 127 127 interrupts = <22 0>; 128 128 wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; 129 - linux,wakeup; 129 + wakeup-source; 130 130 }; 131 131 }; 132 132
+1 -1
arch/arm/boot/dts/imx53-tx53.dtsi
··· 50 50 label = "Power Button"; 51 51 gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>; 52 52 linux,code = <116>; /* KEY_POWER */ 53 - gpio-key,wakeup; 53 + wakeup-source; 54 54 }; 55 55 }; 56 56
+1 -1
arch/arm/boot/dts/imx6dl-tx6u-811x.dts
··· 77 77 interrupt-parent = <&gpio3>; 78 78 interrupts = <22 0>; 79 79 wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; 80 - linux,wakeup; 80 + wakeup-source; 81 81 }; 82 82 }; 83 83
+1 -1
arch/arm/boot/dts/imx6q-gk802.dts
··· 44 44 label = "recovery"; 45 45 gpios = <&gpio3 16 1>; 46 46 linux,code = <0x198>; /* KEY_RESTART */ 47 - gpio-key,wakeup; 47 + wakeup-source; 48 48 }; 49 49 }; 50 50 };
+1 -1
arch/arm/boot/dts/imx6q-tx6q-1110.dts
··· 77 77 interrupt-parent = <&gpio3>; 78 78 interrupts = <22 0>; 79 79 wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; 80 - linux,wakeup; 80 + wakeup-source; 81 81 }; 82 82 }; 83 83
+1 -1
arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
··· 94 94 label = "User button"; 95 95 gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; 96 96 linux,code = <BTN_MISC>; 97 - gpio-key,wakeup; 97 + wakeup-source; 98 98 }; 99 99 }; 100 100
+1 -1
arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
··· 138 138 label = "Power Button"; 139 139 gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; 140 140 linux,code = <KEY_POWER>; 141 - gpio-key,wakeup; 141 + wakeup-source; 142 142 }; 143 143 144 144 menu {
+1 -1
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
··· 119 119 label = "Power Button"; 120 120 gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; 121 121 linux,code = <KEY_POWER>; 122 - gpio-key,wakeup; 122 + wakeup-source; 123 123 }; 124 124 125 125 menu {
+1 -1
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
··· 105 105 label = "Power Button"; 106 106 gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; 107 107 linux,code = <KEY_POWER>; 108 - gpio-key,wakeup; 108 + wakeup-source; 109 109 }; 110 110 111 111 menu {
+3 -3
arch/arm/boot/dts/imx6qdl-sabresd.dtsi
··· 79 79 power { 80 80 label = "Power Button"; 81 81 gpios = <&gpio3 29 GPIO_ACTIVE_LOW>; 82 - gpio-key,wakeup; 82 + wakeup-source; 83 83 linux,code = <KEY_POWER>; 84 84 }; 85 85 86 86 volume-up { 87 87 label = "Volume Up"; 88 88 gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; 89 - gpio-key,wakeup; 89 + wakeup-source; 90 90 linux,code = <KEY_VOLUMEUP>; 91 91 }; 92 92 93 93 volume-down { 94 94 label = "Volume Down"; 95 95 gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; 96 - gpio-key,wakeup; 96 + wakeup-source; 97 97 linux,code = <KEY_VOLUMEDOWN>; 98 98 }; 99 99 };
+3 -3
arch/arm/boot/dts/imx6qdl-tx6.dtsi
··· 52 52 label = "Power Button"; 53 53 gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>; 54 54 linux,code = <KEY_POWER>; 55 - gpio-key,wakeup; 55 + wakeup-source; 56 56 }; 57 57 }; 58 58 ··· 276 276 interrupts = <15 IRQ_TYPE_EDGE_FALLING>; 277 277 reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>; 278 278 wake-gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>; 279 - linux,wakeup; 279 + wakeup-source; 280 280 }; 281 281 282 282 touchscreen: tsc2007@48 { ··· 288 288 interrupts = <26 0>; 289 289 gpios = <&gpio3 26 GPIO_ACTIVE_LOW>; 290 290 ti,x-plate-ohms = <660>; 291 - linux,wakeup; 291 + wakeup-source; 292 292 }; 293 293 }; 294 294
+1 -1
arch/arm/boot/dts/imx6sl-warp.dts
··· 118 118 bus-width = <4>; 119 119 non-removable; 120 120 keep-power-in-suspend; 121 - enable-sdio-wakeup; 121 + wakeup-source; 122 122 mmc-pwrseq = <&usdhc3_pwrseq>; 123 123 status = "okay"; 124 124 };
+1 -1
arch/arm/boot/dts/imx6sx-sabreauto.dts
··· 52 52 cd-gpios = <&gpio7 10 GPIO_ACTIVE_LOW>; 53 53 wp-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; 54 54 keep-power-in-suspend; 55 - enable-sdio-wakeup; 55 + wakeup-source; 56 56 vmmc-supply = <&vcc_sd3>; 57 57 status = "okay"; 58 58 };
+2 -2
arch/arm/boot/dts/imx6sx-sdb.dtsi
··· 283 283 non-removable; 284 284 no-1-8-v; 285 285 keep-power-in-suspend; 286 - enable-sdio-wakeup; 286 + wakeup-source; 287 287 status = "okay"; 288 288 }; 289 289 ··· 296 296 cd-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>; 297 297 wp-gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>; 298 298 keep-power-in-suspend; 299 - enable-sdio-wakeup; 299 + wakeup-source; 300 300 vmmc-supply = <&vcc_sd3>; 301 301 status = "okay"; 302 302 };
+2 -2
arch/arm/boot/dts/imx6ul-14x14-evk.dts
··· 131 131 pinctrl-2 = <&pinctrl_usdhc1_200mhz>; 132 132 cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>; 133 133 keep-power-in-suspend; 134 - enable-sdio-wakeup; 134 + wakeup-source; 135 135 vmmc-supply = <&reg_sd1_vmmc>; 136 136 status = "okay"; 137 137 }; ··· 141 141 pinctrl-0 = <&pinctrl_usdhc2>; 142 142 no-1-8-v; 143 143 keep-power-in-suspend; 144 - enable-sdio-wakeup; 144 + wakeup-source; 145 145 status = "okay"; 146 146 }; 147 147
+1 -1
arch/arm/boot/dts/imx7d-sbc-imx7.dts
··· 22 22 pinctrl-0 = <&pinctrl_usdhc1>; 23 23 cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; 24 24 wp-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; 25 - enable-sdio-wakeup; 25 + wakeup-source; 26 26 status = "okay"; 27 27 }; 28 28
+1 -1
arch/arm/boot/dts/imx7d-sdb.dts
··· 296 296 pinctrl-0 = <&pinctrl_usdhc1>; 297 297 cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; 298 298 wp-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; 299 - enable-sdio-wakeup; 299 + wakeup-source; 300 300 keep-power-in-suspend; 301 301 status = "okay"; 302 302 };