summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/imx6qdl-tx6.dtsi
diff options
context:
space:
mode:
authorSudeep Holla <sudeep.holla@arm.com>2015-10-21 11:10:08 +0100
committerShawn Guo <shawnguo@kernel.org>2016-02-29 16:14:31 +0800
commit26cefdd15db1ebdcc564a23f21e3359342f71bde (patch)
tree91ada19176e022e47333c4892dd53e4760d60d8e /arch/arm/boot/dts/imx6qdl-tx6.dtsi
parent26a91d8938bd1cba5374b50d123cc669b9681254 (diff)
downloadtalos-obmc-linux-26cefdd15db1ebdcc564a23f21e3359342f71bde.tar.gz
talos-obmc-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/imx6qdl-tx6.dtsi')
-rw-r--r--arch/arm/boot/dts/imx6qdl-tx6.dtsi6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
index 13cb7ccfea44..14778298440c 100644
--- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
@@ -52,7 +52,7 @@
label = "Power Button";
gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_POWER>;
- gpio-key,wakeup;
+ wakeup-source;
};
};
@@ -276,7 +276,7 @@
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 @@
interrupts = <26 0>;
gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
ti,x-plate-ohms = <660>;
- linux,wakeup;
+ wakeup-source;
};
};
OpenPOWER on IntegriCloud