summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorFancy Fang <chen.fang@nxp.com>2016-02-29 18:06:53 +0800
committerFancy Fang <chen.fang@nxp.com>2016-03-01 09:55:23 +0800
commit1485cdac101c3af768ac7096c09f1b66f5ca15a0 (patch)
treeefc56592bec6ab1b02570a025c32a98ecddc6e67 /arch
parent8ed7b52849feced89e8ddcbea49ec7426fa4d8bf (diff)
MLK-12457 dts: imx7d-12x12-lpddr3-arm2: correct pwm1 pinctrl settings
The pwm1's pin belongs to lpsr iomux. So this should be corrected. Signed-off-by: Fancy Fang <chen.fang@nxp.com> (cherry picked from commit 94f87fc66f354dea8537d360732612ac5d6d65e6)
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts14
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
index 6c49c2981a2a..00c7113b08ad 100644
--- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
@@ -684,12 +684,6 @@
>;
};
- pinctrl_pwm1: pwm1grp {
- fsl,pins = <
- MX7D_PAD_GPIO1_IO08__PWM1_OUT 0x110b0
- >;
- };
-
pinctrl_sai1: sai1grp {
fsl,pins = <
MX7D_PAD_SAI1_MCLK__SAI1_MCLK 0x1f
@@ -841,6 +835,14 @@
};
&iomuxc_lpsr {
+ imx7d-12x12-lpddr3-arm2 {
+ pinctrl_pwm1: pwm1grp {
+ fsl,pins = <
+ MX7D_PAD_GPIO1_IO01__PWM1_OUT 0x110b0
+ >;
+ };
+ };
+
imx7d-sdb {
pinctrl_usbotg1_vbus: usbotg1vbusgrp {
fsl,pins = <