Commit 3904b814 authored by Marcel Ziswiler's avatar Marcel Ziswiler Committed by Shawn Guo
Browse files

ARM: dts: colibri-imx6: move vbus-supply to module level device tree 



Move USB VBUS supply from single carrier board to module level device
tree. This pin is as per Colibri module family standard.

Signed-off-by: default avatarMarcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent fecd4624

arch/arm/boot/dts/imx6dl-colibri-aster.dts

+0 −1
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ &uart3 { 
};



&usbh1 {

	vbus-supply = <&reg_usb_host_vbus>;

	status = "okay";

};

arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts

+0 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ &uart3 { 
};



&usbh1 {

	vbus-supply = <&reg_usb_host_vbus>;

	status = "okay";

};

arch/arm/boot/dts/imx6dl-colibri-iris.dts

+0 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ &uart3 { 
};



&usbh1 {

	vbus-supply = <&reg_usb_host_vbus>;

	status = "okay";

};

arch/arm/boot/dts/imx6qdl-colibri.dtsi

+7 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ reg_module_3v3_audio: regulator-module-3v3-audio { 


	reg_usb_host_vbus: regulator-usb-host-vbus {

		compatible = "regulator-fixed";

		gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>; /* USBH_PEN */

		gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>; /* SODIMM 129 / USBH_PEN */

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_regulator_usbh_pwr>;

		regulator-max-microvolt = <5000000>;
@@ -677,6 +677,11 @@ &uart3 { 
	status = "disabled";

};



/* Colibri USBH */

&usbh1 {

	vbus-supply = <&reg_usb_host_vbus>;

};



/* Colibri USBC */

&usbotg {

	disable-over-current;
@@ -995,7 +1000,7 @@ MX6QDL_PAD_SD4_DAT2__PWM4_OUT 0x1b0b1 


	pinctrl_regulator_usbh_pwr: gpioregusbhpwrgrp {

		fsl,pins = <

			/* USBH_EN */

			/* SODIMM 129 / USBH_PEN */

			MX6QDL_PAD_EIM_D31__GPIO3_IO31	0x0f058

		>;

	};