summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
diff options
context:
space:
mode:
authorAdrian Alonso <aalonso@freescale.com>2015-08-18 13:19:20 -0500
committerJason Liu <jason.hui.liu@nxp.com>2019-02-12 10:21:57 +0800
commitd401cebea51bf11b5e840d923bd12803685b95b5 (patch)
treec29ca8a7776d8ef47bb8a8a826caa7d42e268954 /arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
parent147e1d6d4249ba8272db0ada20b6514e88e019f3 (diff)
MLK-11381: arm: imx: dts: imx7d-12x12-lpddr3-arm2 iomuxc_lpsr pad settings
- Add iomuxc lpsr pad settings, move pinctrl_usbotg1_vbus and pinctrl_usbotg2_vbus to iomuxc lpsr domain. Signed-off-by: Adrian Alonso <aalonso@freescale.com> Fixed for LPSR rename in 4.14 Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Diffstat (limited to 'arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts')
-rw-r--r--arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts28
1 files changed, 16 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
index dc2f9036d9f4..8fb5d83a3b8d 100644
--- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
@@ -426,18 +426,6 @@
>;
};
- pinctrl_usbotg1_vbus: usbotg1vbusgrp {
- fsl,pins = <
- MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5 0x14
- >;
- };
-
- pinctrl_usbotg2_vbus: usbotg2vbusgrp {
- fsl,pins = <
- MX7D_PAD_LPSR_GPIO1_IO07__GPIO1_IO7 0x14
- >;
- };
-
pinctrl_usdhc1_1: usdhc1grp-1 {
fsl,pins = <
MX7D_PAD_SD1_CMD__SD1_CMD 0x17059
@@ -510,6 +498,22 @@
};
};
+&iomuxc_lpsr {
+ imx7d-sdb {
+ pinctrl_usbotg1_vbus: usbotg1vbusgrp {
+ fsl,pins = <
+ MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5 0x14
+ >;
+ };
+
+ pinctrl_usbotg2_vbus: usbotg2vbusgrp {
+ fsl,pins = <
+ MX7D_PAD_LPSR_GPIO1_IO07__GPIO1_IO7 0x14
+ >;
+ };
+ };
+};
+
&lcdif {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_lcdif_dat