From 419ee867255a34fa9a6f1a8f27d6ab1101710938 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Fri, 7 Mar 2014 09:11:56 +0100 Subject: [PATCH] arm: dts: tx6: move vbus pinctrls to regulator nodes --- arch/arm/boot/dts/imx6qdl-tx6.dtsi | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi index 7db8e028f97f..ee9d273c75ab 100644 --- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi +++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi @@ -320,6 +320,8 @@ regulator-max-microvolt = <5000000>; gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>; enable-active-high; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_tx6_usbh1_vbus>; }; reg_usbotg_vbus: regulator@8 { @@ -330,6 +332,8 @@ regulator-max-microvolt = <5000000>; gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>; enable-active-high; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_tx6_usbotg_vbus>; }; }; @@ -712,8 +716,6 @@ &usbh1 { vbus-supply = <®_usbh1_vbus>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_tx6_usbh1_vbus>; dr_mode = "host"; disable-over-current; status = "okay"; @@ -722,7 +724,7 @@ &usbotg { vbus-supply = <®_usbotg_vbus>; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_tx6_usbotg &pinctrl_tx6_usbotg_vbus>; + pinctrl-0 = <&pinctrl_tx6_usbotg>; dr_mode = "peripheral"; disable-over-current; status = "okay"; -- 2.39.2