arm64: dts: imx8mm-venice-gw71xx: fix USB OTG VBUS

The GW71xx does not have a gpio controlled vbus regulator but it does
require some pinctrl. Remove the regulator and move the valid pinctrl
into the usbotg1 node.

Fixes: bd306fdb4e60 ("arm64: dts: imx8mm-venice-gw71xx: fix USB OTG VBUS")
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx.dtsi b/arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx.dtsi
index 6425773f68e0a2344e98c62c1b75f215f9f32775..bbbaf2165ea28f905ae2f609a092ec83d3d68afc 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx.dtsi
@@ -47,17 +47,6 @@
                gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
                status = "okay";
        };
-
-       reg_usb_otg1_vbus: regulator-usb-otg1 {
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_reg_usb1_en>;
-               compatible = "regulator-fixed";
-               regulator-name = "usb_otg1_vbus";
-               gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-       };
 };
 
 /* off-board header */
@@ -144,9 +133,10 @@
 };
 
 &usbotg1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usbotg1>;
        dr_mode = "otg";
        over-current-active-low;
-       vbus-supply = <&reg_usb_otg1_vbus>;
        status = "okay";
 };
 
@@ -204,14 +194,6 @@
                >;
        };
 
-       pinctrl_reg_usb1_en: regusb1grp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_GPIO1_IO10_GPIO1_IO10      0x41
-                       MX8MM_IOMUXC_GPIO1_IO12_GPIO1_IO12      0x141
-                       MX8MM_IOMUXC_GPIO1_IO13_USB1_OTG_OC     0x41
-               >;
-       };
-
        pinctrl_spi2: spi2grp {
                fsl,pins = <
                        MX8MM_IOMUXC_ECSPI2_SCLK_ECSPI2_SCLK    0xd6
@@ -234,4 +216,11 @@
                        MX8MM_IOMUXC_UART3_TXD_UART3_DCE_TX     0x140
                >;
        };
+
+       pinctrl_usbotg1: usbotg1grp {
+               fsl,pins = <
+                       MX8MM_IOMUXC_GPIO1_IO12_GPIO1_IO12      0x141
+                       MX8MM_IOMUXC_GPIO1_IO13_USB1_OTG_OC     0x41
+               >;
+       };
 };