Merge tag 'u-boot-imx-20190612' of git://git.denx.de/u-boot-imx

[thirdparty/u-boot.git] / arch / arm / dts / imx7-colibri-emmc.dts

diff --git a/arch/arm/dts/imx7-colibri-emmc.dts b/arch/arm/dts/imx7-colibri-emmc.dts
index 8db2a6270783f79cf2a80ceba144b873f036b577..bc0d10c716d369a61a644d3fde48768dfff3d991 100644 (file)
--- a/arch/arm/dts/imx7-colibri-emmc.dts
+++ b/arch/arm/dts/imx7-colibri-emmc.dts
@@ -15,11 +15,30 @@
                mmc0 = &usdhc3;
                mmc1 = &usdhc1;
                display1 = &lcdif;
+               usb0 = &usbotg1; /* required for ums */
        };
 
        chosen {
                stdout-path = &uart1;
        };
+
+       reg_5v0: regulator-5v0 {
+               compatible = "regulator-fixed";
+               regulator-name = "5V";
+               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>;
+       };
 };
 
 &usdhc3 {
@@ -46,4 +65,30 @@
                        MX7D_PAD_SD3_STROBE__SD3_STROBE         0x19
                >;
        };
+
+       pinctrl_usbh_reg: gpio-usbh-vbus {
+               fsl,pins = <
+                       MX7D_PAD_UART3_CTS_B__GPIO4_IO7 0x14
+               >;
+       };
+};
+
+/* Colibri USBC */
+&usbotg1 {
+       /*
+        * usbotg1 on Colibri iMX7 can function in both host/otg modes.
+        * Gadget stack currently does not look at this at all while
+        * the host stack refuses to bind/load if it is not set to host
+        * (it obviously won't be enumerated during usb start invocation
+        * if dr_mode = "otg")
+        */
+       dr_mode = "host";
+       status = "okay";
+};
+
+/* Colibri USBH */
+&usbotg2 {
+       dr_mode = "host";
+       vbus-supply = <&reg_usbh_vbus>;
+       status = "okay";
 };