summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx7-colibri.dtsi
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-09-12 13:47:35 -0700
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-01-10 23:10:06 +0100
commit27931d0808d93ac7d48ae85a52098cf461079e92 (patch)
tree6fdbc8fa383b070287a9a8a25b69ba7620e22eaf /arch/arm/boot/dts/imx7-colibri.dtsi
parent8a801fc2dd8492b7c6c3b83095d7d5b98feda705 (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> (cherry picked from commit b5d2713d64c1c69f5dfe14a273e593acac089287)
Diffstat (limited to 'arch/arm/boot/dts/imx7-colibri.dtsi')
-rw-r--r--arch/arm/boot/dts/imx7-colibri.dtsi15
1 files changed, 2 insertions, 13 deletions
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