summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/imx7d-sdb.dts
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-01-19 10:09:22 +0100
committerShawn Guo <shawnguo@kernel.org>2017-01-29 09:53:01 +0800
commit9a20aa2677fd4858ccda0059dfbda354bda90070 (patch)
tree4d877701bf005ba5fef7b84a906c185a900e66d1 /arch/arm/boot/dts/imx7d-sdb.dts
parent1d4a594338fb2414f864b9e5454b4d17173df075 (diff)
downloadop-kernel-dev-9a20aa2677fd4858ccda0059dfbda354bda90070.zip
op-kernel-dev-9a20aa2677fd4858ccda0059dfbda354bda90070.tar.gz
ARM: dts: imx7d-sdb: Fix watchdog and pwm pinmux
The watchdog pin and the pwm output pin are controlled by the iomuxc_lpsr, not the regular iomux, so move the pins there. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/imx7d-sdb.dts')
-rw-r--r--arch/arm/boot/dts/imx7d-sdb.dts24
1 files changed, 13 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
index 2f33c46..66cf5b4 100644
--- a/arch/arm/boot/dts/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -502,12 +502,6 @@
>;
};
- pinctrl_pwm1: pwm1grp {
- fsl,pins = <
- MX7D_PAD_GPIO1_IO01__PWM1_OUT 0x110b0
- >;
- };
-
pinctrl_tsc2046_pendown: tsc2046_pendown {
fsl,pins = <
MX7D_PAD_EPDC_BDR1__GPIO2_IO29 0x59
@@ -635,11 +629,19 @@
MX7D_PAD_SD3_STROBE__SD3_STROBE 0x1b
>;
};
+ };
+};
- pinctrl_wdog: wdoggrp {
- fsl,pins = <
- MX7D_PAD_GPIO1_IO00__WDOD1_WDOG_B 0x74
- >;
- };
+&iomuxc_lpsr {
+ pinctrl_wdog: wdoggrp {
+ fsl,pins = <
+ MX7D_PAD_GPIO1_IO00__WDOD1_WDOG_B 0x74
+ >;
+ };
+
+ pinctrl_pwm1: pwm1grp {
+ fsl,pins = <
+ MX7D_PAD_GPIO1_IO01__PWM1_OUT 0x110b0
+ >;
};
};
OpenPOWER on IntegriCloud