Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e81cb3d authored by Stefan Agner's avatar Stefan Agner Committed by Shawn Guo
Browse files

ARM: dts: imx7-colibri: move and rename USB Host power regulator 



The Colibri default which enables USB Host power is not necessarily
tied to the OTG2 controller, some carrier board use the pin to
control USB power for both controllers. Hence name the pinctrl
group more generic.

Also move the regulator to the generic eval-v3 device tree since
the regulator is always on the carrier board. In the Colibri iMX7S
case the regulator is just not used.  This allows to reuse the
regulator in a upcoming SKU Colibri iMX7D 1GB with eMMC.

Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
Reviewed-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 4d9a3877

arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -70,6 +70,17 @@ 
		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};



	reg_usbh_vbus: regulator-usbh-vbus {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_usbh_reg>;

		regulator-name = "VCC_USB[1-4]";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		gpio = <&gpio4 7 GPIO_ACTIVE_LOW>;

		vin-supply = <&reg_5v0>;

	};

};



&bl {

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

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ 
		>;

	};



	pinctrl_usbotg2_reg: gpio-usbotg2-vbus {

	pinctrl_usbh_reg: gpio-usbh-vbus {

		fsl,pins = <

			MX7D_PAD_UART3_CTS_B__GPIO4_IO7	0x14 /* SODIMM 129 USBH PEN */

		>;

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

+1 −12
Original line number Diff line number Diff line
@@ -48,20 +48,9 @@ 
	model = "Toradex Colibri iMX7D on Colibri Evaluation Board V3";

	compatible = "toradex,colibri-imx7d-eval-v3", "toradex,colibri-imx7d",

		     "fsl,imx7d";



	reg_usb_otg2_vbus: regulator-usb-otg2-vbus {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_usbotg2_reg>;

		regulator-name = "VCC_USB[1-4]";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		gpio = <&gpio4 7 GPIO_ACTIVE_LOW>;

		vin-supply = <&reg_5v0>;

	};

};



&usbotg2 {

	vbus-supply = <&reg_usb_otg2_vbus>;

	vbus-supply = <&reg_usbh_vbus>;

	status = "okay";

};