Skip to content

Commit 08b88e8

Browse files
sudeep-hollaShawn Guo
authored andcommitted
ARM: dts: imx: replace gpio-key,wakeup with wakeup-source property
Most of the legacy "gpio-key,wakeup" and "enable-sdio-wakeup" boolean properties are already replaced with "wakeup-source". However few occurrences of old property has popped up again, probably from the remnants in downstream trees. Almost all of those were remove couple of years back. Replace the legacy properties with the unified "wakeup-source" property introduced in the commit 700a38b ("Input: gpio_keys - switch to using generic device properties") and commit 0dbcdc0 ("mmc: core: enable support for the standard "wakeup-source" property") Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Shawn Guo <shawnguo@kernel.org> Cc: NXP Linux Team <linux-imx@nxp.com> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
1 parent 00ccd45 commit 08b88e8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/arm/boot/dts/imx6q-pistachio.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
power {
104104
label = "Power Button";
105105
gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
106-
gpio-key,wakeup;
106+
wakeup-source;
107107
linux,code = <KEY_POWER>;
108108
};
109109
};

arch/arm/boot/dts/imx6sll-evk.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@
309309
pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
310310
cd-gpios = <&gpio3 22 GPIO_ACTIVE_LOW>;
311311
keep-power-in-suspend;
312-
enable-sdio-wakeup;
312+
wakeup-source;
313313
vmmc-supply = <&reg_sd3_vmmc>;
314314
status = "okay";
315315
};

0 commit comments

Comments
 (0)