From d401cebea51bf11b5e840d923bd12803685b95b5 Mon Sep 17 00:00:00 2001 From: Adrian Alonso Date: Tue, 18 Aug 2015 13:19:20 -0500 Subject: 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 Fixed for LPSR rename in 4.14 Signed-off-by: Leonard Crestez --- arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts | 28 +++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'arch/arm') 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 -- cgit v1.2.3