ARM: tegra: fix USB ULPI PHY reset signal inversion confusion

From: Stephen Warren <[email protected]>

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 at c5008000': seq 0 is in use by 'usb at 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 <[email protected]>

Signed-off-by Stephen Warren <[email protected]>

---
 arch/arm/dts/tegra20-harmony.dts   | 3 ++-
 arch/arm/dts/tegra20-seaboard.dts  | 5 +++--
 arch/arm/dts/tegra20-trimslice.dts | 3 +--
 arch/arm/dts/tegra20-ventana.dts   | 4 +++-
 4 files changed, 9 insertions(+), 6 deletions(-)

From: Stephen Warren <[email protected]>

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 at c5008000': seq 0 is in use by 'usb at 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 <[email protected]>

Signed-off-by Stephen Warren <[email protected]>

---

?arch/arm/dts/tegra20-harmony.dts???| 3 ++-
?arch/arm/dts/tegra20-seaboard.dts??| 5 +++--
?arch/arm/dts/tegra20-trimslice.dts | 3 +--
?arch/arm/dts/tegra20-ventana.dts???| 4 +++-

?4 files changed, 9 insertions(+), 6 deletions(-)

arch/arm/dts/tegra20- renamed from arch/arm/dts/tegra20-harmony.dts +0 -0

harmony.dts
index 5aec150b5e61..dcbde7c2ed7e 100644

arch/arm/dts/tegra20-harmony.dts +0 -0

 ?	};

arch/arm/dts/tegra20-seaboard.dts +0 -0

index 14210519a6c2..77f5bb51b027 100644
@@ -9,8 +9,9 @@

?
? aliases {
? /* This defines the order of our ports */

arch/arm/dts/tegra20-seaboard.dts +3 -2

-		usb0 = "/usb at c5008000";
-		usb1 = "/usb at c5000000";
+		usb0 = "/usb at c5000000";
+		usb1 = "/usb at c5004000";
+		usb2 = "/usb at c5008000";

? i2c0 = "/i2c at 7000d000";
? i2c1 = "/i2c at 7000c000";
? i2c2 = "/i2c at 7000c400";

arch/arm/dts/tegra20-trimslice.dts +0 -0

index be64e667cd5b..7fb7dd0b5815 100644
@@ -11,8 +11,7 @@
 ?	};

?
? aliases {

arch/arm/dts/tegra20-trimslice.dts +1 -2

-		usb0 = "/usb at c5008000";
-		usb1 = "/usb at c5000000";
+		usb0 = "/usb at c5000000";

? mmc0 = "/sdhci at c8000600";
? mmc1 = "/sdhci at c8000000";
? spi0 = "/spi at 7000c380";

arch/arm/dts/tegra20- renamed from arch/arm/dts/tegra20-ventana.dts +0 -0

ventana.dts
index 371445622c1e..85cd1e39bda7 100644

From: Stephen Warren <[email protected]>

Commit ce02a71c2374 "tegra: dts: Sync tegra20 device tree files with Linux" enabled the ULPI USB port on Ventana, but made no attempt to ensure that U-Boot code could handle this. In practice, various code is missing, and various configuration options are not enabled, which causes U-Boot to hang when attempting to initialize this USB port. This patch enables ULPI PHY support on Ventana, and adds the required pinmux setup for the port to operate. Note that Ventana is so similar to Seaboard that this change is made in the Seaboard board file, which is shared with Ventana.

Seaboard also has the ULPI USB port wired up in hardware, although to an internal port that often doesn't have anything attached to it. However, the DT nodes for the USB controller and PHY had different status property values, so the port was not initialized by U-Boot. Fix this inconsistency, and enable the ULPI port, just like in the Linux kernel DT. This likewise requires enabling ULPI support in the Seaboard defconfig.

Cc Marcel Ziswiler <[email protected]>

Signed-off-by Stephen Warren <[email protected]>

---
 arch/arm/dts/tegra20-seaboard.dts | 2 +-
 board/nvidia/seaboard/seaboard.c  | 8 +++++++-
 configs/seaboard_defconfig        | 2 ++
 configs/ventana_defconfig         | 2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)

From: Stephen Warren <[email protected]>

USB ULPI PHY reset signals are typically active low. Consequently, they should be marked as GPIO_ACTIVE_LOW in device tree, and indeed they are in the Linux kernel DTs, and in DT properties that U-Boot doesn't yet use. However, in DT properties that U-Boot does use, the value has been set to 0 (== GPIO_ACTIVE_HIGH) to work around a bug in U-Boot.

This change fixes the DT to correctly represent the HW, and fixes the Tegra USB driver to cope with the fact that dm_gpio_set_value() internally handles any inversions implied by the DT value GPIO_ACTIVE_LOW.

Cc Marcel Ziswiler <[email protected]>

Signed-off-by Stephen Warren <[email protected]>

---
 arch/arm/dts/tegra20-colibri.dts |  3 ++-
 arch/arm/dts/tegra20-harmony.dts |  3 ++-
 drivers/usb/host/ehci-tegra.c    | 13 +++++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)