imx: ventana: fix UMS support

The Gateworks Ventana boards have always had usb0=usbh1 and usb1=usbotg
because OTG is often subloaded on these boards and a bit in the EEPROM
which flagging that OTG is subloaded is used to remove the dt node via the
alias.

U-Boot DM_USB UMS requires the usb0 alias be assigned to the usbotg
so fix the usb0 alias in order for UMS to work.

Fixes 72c46327f03f: ("imx: ventana: enable dm support for USB")

Signed-off-by: Tim Harvey <tharvey@gateworks.com>

diff --git a/arch/arm/dts/imx6qdl-gw51xx.dtsi b/arch/arm/dts/imx6qdl-gw51xx.dtsi
index 7e28463084a69d16531c8bf05701f95655f90a95..76a41d563cb3e9cfbf3f58447d2999b27a2b850d 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw51xx.dtsi
+++ b/arch/arm/dts/imx6qdl-gw51xx.dtsi
@@ -13,8 +13,8 @@
                led0 = &led0;
                led1 = &led1;
                nand = &gpmi;
-               usb0 = &usbh1;
-               usb1 = &usbotg;
+               usb0 = &usbotg;
+               usb1 = &usbh1;
        };
 
        chosen {

diff --git a/arch/arm/dts/imx6qdl-gw52xx.dtsi b/arch/arm/dts/imx6qdl-gw52xx.dtsi
index f1d9ba1fac6a7026d764268cf977ecfe26c87852..31a059f26b3621062e6f85bfb114a25d8b214833 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw52xx.dtsi
+++ b/arch/arm/dts/imx6qdl-gw52xx.dtsi
@@ -16,8 +16,8 @@
                mmc0 = &usdhc3;
                nand = &gpmi;
                ssi0 = &ssi1;
-               usb0 = &usbh1;
-               usb1 = &usbotg;
+               usb0 = &usbotg;
+               usb1 = &usbh1;
        };
 
        chosen {

diff --git a/arch/arm/dts/imx6qdl-gw53xx.dtsi b/arch/arm/dts/imx6qdl-gw53xx.dtsi
index 172a45ba17803e343d86afbe5862f93016002b4c..904b2283063187469c7c389f066fb62163de85f4 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw53xx.dtsi
+++ b/arch/arm/dts/imx6qdl-gw53xx.dtsi
@@ -16,8 +16,8 @@
                mmc0 = &usdhc3;
                nand = &gpmi;
                ssi0 = &ssi1;
-               usb0 = &usbh1;
-               usb1 = &usbotg;
+               usb0 = &usbotg;
+               usb1 = &usbh1;
        };
 
        chosen {

diff --git a/arch/arm/dts/imx6qdl-gw54xx.dtsi b/arch/arm/dts/imx6qdl-gw54xx.dtsi
index e09fad6068ca5d5f3ff240f48c0104cbe11cae02..95939cf277ce548b34ebff1c28e8dc9de59db679 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/dts/imx6qdl-gw54xx.dtsi
@@ -17,8 +17,8 @@
                mmc0 = &usdhc3;
                nand = &gpmi;
                ssi0 = &ssi1;
-               usb0 = &usbh1;
-               usb1 = &usbotg;
+               usb0 = &usbotg;
+               usb1 = &usbh1;
        };
 
        chosen {

diff --git a/arch/arm/dts/imx6qdl-gw551x.dtsi b/arch/arm/dts/imx6qdl-gw551x.dtsi
index 1bb586cbd5dfd7745cc60392fca6437099295021..c0ffea16d81e12a1df84a3300b1b3bf045f01d69 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw551x.dtsi
+++ b/arch/arm/dts/imx6qdl-gw551x.dtsi
@@ -57,8 +57,8 @@
                led0 = &led0;
                nand = &gpmi;
                ssi0 = &ssi1;
-               usb0 = &usbh1;
-               usb1 = &usbotg;
+               usb0 = &usbotg;
+               usb1 = &usbh1;
        };
 
        chosen {

diff --git a/arch/arm/dts/imx6qdl-gw552x.dtsi b/arch/arm/dts/imx6qdl-gw552x.dtsi
index 7935b10eabb59d9d4a8ea8e818619da70931580d..f6742e513152ac361c275f346a7b12821e1a3b34 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw552x.dtsi
+++ b/arch/arm/dts/imx6qdl-gw552x.dtsi
@@ -14,8 +14,8 @@
                led1 = &led1;
                led2 = &led2;
                nand = &gpmi;
-               usb0 = &usbh1;
-               usb1 = &usbotg;
+               usb0 = &usbotg;
+               usb1 = &usbh1;
        };
 
        chosen {

diff --git a/arch/arm/dts/imx6qdl-gw553x.dtsi b/arch/arm/dts/imx6qdl-gw553x.dtsi
index b6965f25da9325d8af41b4f62a028b643b77855d..e21f068bec0a7a2d4b397c1b3b9493c36e47fda5 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw553x.dtsi
+++ b/arch/arm/dts/imx6qdl-gw553x.dtsi
@@ -55,8 +55,8 @@
                led0 = &led0;
                led1 = &led1;
                nand = &gpmi;
-               usb0 = &usbh1;
-               usb1 = &usbotg;
+               usb0 = &usbotg;
+               usb1 = &usbh1;
        };
 
        chosen {

diff --git a/arch/arm/dts/imx6qdl-gw560x.dtsi b/arch/arm/dts/imx6qdl-gw560x.dtsi
index bfe65fd3c09bc0129f0b62698fee3fb78c3fd5c9..5da19756e031e6933a9ec790f2357a5d95455f18 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw560x.dtsi
+++ b/arch/arm/dts/imx6qdl-gw560x.dtsi
@@ -58,8 +58,8 @@
                mmc0 = &usdhc2;
                mmc1 = &usdhc3;
                ssi0 = &ssi1;
-               usb0 = &usbh1;
-               usb1 = &usbotg;
+               usb0 = &usbotg;
+               usb1 = &usbh1;
        };
 
        chosen {

diff --git a/arch/arm/dts/imx6qdl-gw5904.dtsi b/arch/arm/dts/imx6qdl-gw5904.dtsi
index 9adbd728dce822ee7bcdf7486d07c064ed957de0..b5ed2d83c17c609d5921a48d10fbcc83990be0c0 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw5904.dtsi
+++ b/arch/arm/dts/imx6qdl-gw5904.dtsi
@@ -56,8 +56,8 @@
                led1 = &led1;
                led2 = &led2;
                mmc0 = &usdhc3;
-               usb0 = &usbh1;
-               usb1 = &usbotg;
+               usb0 = &usbotg;
+               usb1 = &usbh1;
        };
 
        chosen {

diff --git a/arch/arm/dts/imx6qdl-gw5907.dtsi b/arch/arm/dts/imx6qdl-gw5907.dtsi
index 58f73a141e4c4f4d9e46bc5527e74af413148337..a36b6e7048c79dcbb267d6f6f9f4e193606ba453 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw5907.dtsi
+++ b/arch/arm/dts/imx6qdl-gw5907.dtsi
@@ -13,8 +13,8 @@
                led0 = &led0;
                led1 = &led1;
                nand = &gpmi;
-               usb0 = &usbh1;
-               usb1 = &usbotg;
+               usb0 = &usbotg;
+               usb1 = &usbh1;
        };
 
        chosen {

diff --git a/arch/arm/dts/imx6qdl-gw5912.dtsi b/arch/arm/dts/imx6qdl-gw5912.dtsi
index 88234a6f1342f4971d841d785c158b7ccda7879c..2537288627d86f5a377a6ab58cbdc0cb17b171ff 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw5912.dtsi
+++ b/arch/arm/dts/imx6qdl-gw5912.dtsi
@@ -15,8 +15,8 @@
                led2 = &led2;
                mmc0 = &usdhc3;
                nand = &gpmi;
-               usb0 = &usbh1;
-               usb1 = &usbotg;
+               usb0 = &usbotg;
+               usb1 = &usbh1;
        };
 
        chosen {

diff --git a/arch/arm/dts/imx6qdl-gw5913.dtsi b/arch/arm/dts/imx6qdl-gw5913.dtsi
index f4c2b2189f00bdc6b666bc089bc03e811a4cc73b..c2c1c2b160d4e66987eeee11a2a02bcd9f3df955 100644 (file)
--- a/arch/arm/dts/imx6qdl-gw5913.dtsi
+++ b/arch/arm/dts/imx6qdl-gw5913.dtsi
@@ -13,8 +13,8 @@
                led0 = &led0;
                led1 = &led1;
                nand = &gpmi;
-               usb0 = &usbh1;
-               usb1 = &usbotg;
+               usb0 = &usbotg;
+               usb1 = &usbh1;
        };
 
        chosen {