ARM: tegra: fix USB controller aliases

Some boards have a different set of USB controllers enabled in DT than
the set referenced by /alias entries. This patch fixes that. For
example, this avoids the following message while booting on Ventana,
which is caused by the fact that the USB0 controller had no alias, and
defaulted to wanting a sequence number of 0, which was later explicitly
requested by the alias for USB controller 2.

USB2:   Device 'usb@c5008000': seq 0 is in use by 'usb@c5000000'

This didn't affect USB operation in any way though.

Related, there's no need for the USB controller aliases to have an order
that's different from the HW order, so re-order any aliases to match the
HW ordering. This has the benefit that since USB controller 0 is the only
one that supports device-mode in HW, and U-Boot only supports enabling
device move on controller 0, there's now good synergy in the ordering! For
Tegra20, that's not relevant at present since USB device mode doesn't work
correctly on that SoC, but it will save some head-scratching later.

This patch doesn't fix the colibri_t20 board, even though it has the same
issue, since Marcel already sent a patch for that.

Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Tested-on: Harmony and Ventana

diff --git a/arch/arm/dts/tegra20-harmony.dts b/arch/arm/dts/tegra20-harmony.dts
index 5aec150b5e6121c144764ad6048dc5e6892a3303..dcbde7c2ed7e85f6650f52783755760ee7222935 100644 (file)
--- a/arch/arm/dts/tegra20-harmony.dts
+++ b/arch/arm/dts/tegra20-harmony.dts
@@ -15,8 +15,9 @@
                rtc0 = "/i2c@7000d000/tps6586x@34";
                rtc1 = "/rtc@7000e000";
                serial0 = &uartd;
-               usb0 = "/usb@c5008000";
+               usb0 = "/usb@c5000000";
                usb1 = "/usb@c5004000";
+               usb2 = "/usb@c5008000";
                mmc0 = "/sdhci@c8000600";
                mmc1 = "/sdhci@c8000200";
        };

diff --git a/arch/arm/dts/tegra20-seaboard.dts b/arch/arm/dts/tegra20-seaboard.dts
index 14210519a6c2dc54e60f6b086e42dec2d3a32ab7..77f5bb51b02765b0710622312727830b94e94eb6 100644 (file)
--- a/arch/arm/dts/tegra20-seaboard.dts
+++ b/arch/arm/dts/tegra20-seaboard.dts
@@ -9,8 +9,9 @@
 
        aliases {
                /* This defines the order of our ports */
-               usb0 = "/usb@c5008000";
-               usb1 = "/usb@c5000000";
+               usb0 = "/usb@c5000000";
+               usb1 = "/usb@c5004000";
+               usb2 = "/usb@c5008000";
                i2c0 = "/i2c@7000d000";
                i2c1 = "/i2c@7000c000";
                i2c2 = "/i2c@7000c400";

diff --git a/arch/arm/dts/tegra20-trimslice.dts b/arch/arm/dts/tegra20-trimslice.dts
index be64e667cd5b4dfa9566537451e3d557e8b5208a..7fb7dd0b581529cf105e9f0bcf23fbb44de4fe42 100644 (file)
--- a/arch/arm/dts/tegra20-trimslice.dts
+++ b/arch/arm/dts/tegra20-trimslice.dts
@@ -11,8 +11,7 @@
        };
 
        aliases {
-               usb0 = "/usb@c5008000";
-               usb1 = "/usb@c5000000";
+               usb0 = "/usb@c5000000";
                mmc0 = "/sdhci@c8000600";
                mmc1 = "/sdhci@c8000000";
                spi0 = "/spi@7000c380";

diff --git a/arch/arm/dts/tegra20-ventana.dts b/arch/arm/dts/tegra20-ventana.dts
index 371445622c1ea0ed59a07d1e8623ecdcc9d04b88..85cd1e39bda7739dd2de118c0965ab77f61b9ad6 100644 (file)
--- a/arch/arm/dts/tegra20-ventana.dts
+++ b/arch/arm/dts/tegra20-ventana.dts
@@ -15,7 +15,9 @@
                rtc0 = "/i2c@7000d000/tps6586x@34";
                rtc1 = "/rtc@7000e000";
                serial0 = &uartd;
-               usb0 = "/usb@c5008000";
+               usb0 = "/usb@c5000000";
+               usb1 = "/usb@c5004000";
+               usb2 = "/usb@c5008000";
                mmc0 = "/sdhci@c8000600";
                mmc1 = "/sdhci@c8000400";
        };