summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-09-12 13:47:35 -0700
committerMax Krummenacher <max.krummenacher@toradex.com>2016-09-29 15:22:11 +0200
commitb5d2713d64c1c69f5dfe14a273e593acac089287 (patch)
tree0a75b8c0b7c6162a8829b3445702ec8c100bc999
parent35da2dc4487466dd2dbaf2437e481ea7b0730cb2 (diff)
ARM: dts: imx7-colibri: add GPIO wakeup key
Add wakeup GPIO key which is able to wake the system from sleep modes (e.g. Suspend-to-Memory). Also rename the intermediate node to imx7d-colibri. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi34
-rw-r--r--arch/arm/boot/dts/imx7-colibri.dtsi15
2 files changed, 36 insertions, 13 deletions
diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
index 135592880009..306680c0e38a 100644
--- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
@@ -22,6 +22,20 @@
clock-output-names = "clk16m";
};
};
+
+ gpio-keys {
+ compatible = "gpio-keys";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpiokeys>;
+
+ power {
+ label = "Wake-Up";
+ gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
+ linux,code = <KEY_WAKEUP>;
+ debounce-interval = <10>;
+ gpio-key,wakeup;
+ };
+ };
};
&bl {
@@ -279,3 +293,23 @@
};
};
};
+
+&iomuxc_lpsr {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpio1>;
+
+ imx7d-eval-v3 {
+ pinctrl_gpio1: gpio1grp {
+ fsl,pins = <
+ MX7D_PAD_GPIO1_IO02__GPIO1_IO2 0x59
+ MX7D_PAD_GPIO1_IO03__GPIO1_IO3 0x59
+ >;
+ };
+
+ pinctrl_gpiokeys: gpiokeysgrp {
+ fsl,pins = <
+ MX7D_PAD_GPIO1_IO01__GPIO1_IO1 0x59
+ >;
+ };
+ };
+};
diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
index f56fa805a8e4..d3973462317c 100644
--- a/arch/arm/boot/dts/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri.dtsi
@@ -307,7 +307,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_hog_1 &pinctrl_hog_2 &pinctrl_hog_3 &pinctrl_hog_4 &pinctrl_hog_5>;
- imx7d-sdb {
+ imx7d-colibri {
pinctrl_hog_1: hoggrp-1 {
fsl,pins = <
MX7D_PAD_UART3_CTS_B__GPIO4_IO7 0x14 /* SODIMM 129 USBH PEN */
@@ -625,18 +625,7 @@
};
&iomuxc_lpsr {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_gpio1>;
-
- imx7d-sdb {
- pinctrl_gpio1: gpio1grp {
- fsl,pins = <
- MX7D_PAD_GPIO1_IO01__GPIO1_IO1 0x59
- MX7D_PAD_GPIO1_IO02__GPIO1_IO2 0x59
- MX7D_PAD_GPIO1_IO03__GPIO1_IO3 0x59
- >;
- };
-
+ imx7d-colibri {
pinctrl_i2c1: i2c1grp {
fsl,pins = <
MX7D_PAD_GPIO1_IO05__I2C1_SDA 0x4000007f