diff options
author | Sudeep Holla <sudeep.holla@arm.com> | 2015-10-21 12:10:08 +0200 |
---|---|---|
committer | Shawn Guo <shawnguo@kernel.org> | 2016-02-29 09:14:31 +0100 |
commit | 26cefdd15db1ebdcc564a23f21e3359342f71bde (patch) | |
tree | 91ada19176e022e47333c4892dd53e4760d60d8e /arch/arm/boot/dts/imx6ul-14x14-evk.dts | |
parent | ARM: dts: vf610: add remaining SAI instaces (diff) | |
download | linux-26cefdd15db1ebdcc564a23f21e3359342f71bde.tar.xz linux-26cefdd15db1ebdcc564a23f21e3359342f71bde.zip |
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>
Diffstat (limited to 'arch/arm/boot/dts/imx6ul-14x14-evk.dts')
-rw-r--r-- | arch/arm/boot/dts/imx6ul-14x14-evk.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dts b/arch/arm/boot/dts/imx6ul-14x14-evk.dts index 6aaa5ec3d846..e06fe978ae3b 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dts +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dts @@ -131,7 +131,7 @@ pinctrl-2 = <&pinctrl_usdhc1_200mhz>; cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>; keep-power-in-suspend; - enable-sdio-wakeup; + wakeup-source; vmmc-supply = <®_sd1_vmmc>; status = "okay"; }; @@ -141,7 +141,7 @@ pinctrl-0 = <&pinctrl_usdhc2>; no-1-8-v; keep-power-in-suspend; - enable-sdio-wakeup; + wakeup-source; status = "okay"; }; |