summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2014-12-01 18:09:23 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2014-12-10 17:25:06 +0100
commit1408747c7af9a911569a903163ac48d13632947b (patch)
treed17d679492bbb6a35155945aff87921b946f3a49 /arch/arm/boot/dts
parent87e04bf9349f3ce338d2313a1a44df2b5d92e90a (diff)
apalis/colibri imx6 dtb: rename power-key to wake-up-key
The key used for wakeup from suspend was named 'Power' and configured to send the KEY_POWER code. Currently this is misleading, would one add functionality to the kernel to actually turn off the system when KEY_POWER is received then this would lead to the wakeup event also generating a power down event later. Rename the key to 'Wakeup' and send the KEY_WAKEUP code to the input subsystem. If one really would use the key
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts6
-rw-r--r--arch/arm/boot/dts/imx6q-apalis-eval.dts6
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index 8735e99ef611..2a418b1b0c20 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -39,10 +39,10 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_keys>;
- power {
- label = "Power";
+ wakeup {
+ label = "Wakeup";
gpios = <&gpio2 22 GPIO_ACTIVE_HIGH>;
- linux,code = <KEY_POWER>;
+ linux,code = <KEY_WAKEUP>;
debounce-interval = <10>;
gpio-key,wakeup;
};
diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts
index 8656d9a18663..aa3df862454c 100644
--- a/arch/arm/boot/dts/imx6q-apalis-eval.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts
@@ -40,10 +40,10 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_keys>;
- power {
- label = "Power";
+ wakeup {
+ label = "wakeup";
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
- linux,code = <KEY_POWER>;
+ linux,code = <KEY_WAKEUP>;
debounce-interval = <10>;
gpio-key,wakeup;
};