usb: tegra: ULPI regression on tegra20
authorMarcel Ziswiler <marcel@ziswiler.com>
Fri, 3 Oct 2014 23:46:10 +0000 (01:46 +0200)
committerMarek Vasut <marex@denx.de>
Mon, 6 Oct 2014 14:12:48 +0000 (16:12 +0200)
Trying to enumerate USB devices connected via ULPI to T20 failed as
follows:

USB2:   ULPI integrity check failed

Git bisecting revealed the following commit being at odds:

commit 2d34151f7501ddaa599897f0d89ad576126b03eb
usb: tegra: refactor PHY type selection

Looking at above commit one quickly identifies a copy paste error which
this patch fixes. Happy ULPIing again (;-p).

Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
drivers/usb/host/ehci-tegra.c

index 33e5ea9ebdd0d836d4412af5971f558b790dc8bd..5f0a98e8b80b59f79372e2185e31e16585c6dd7f 100644 (file)
@@ -305,11 +305,11 @@ static void init_phy_mux(struct fdt_usb *config, uint pts,
 #if defined(CONFIG_TEGRA20)
        if (config->periph_id == PERIPH_ID_USBD) {
                clrsetbits_le32(&usbctlr->port_sc1, PTS1_MASK,
-                               PTS_UTMI << PTS1_SHIFT);
+                               pts << PTS1_SHIFT);
                clrbits_le32(&usbctlr->port_sc1, STS1);
        } else {
                clrsetbits_le32(&usbctlr->port_sc1, PTS_MASK,
-                               PTS_UTMI << PTS_SHIFT);
+                               pts << PTS_SHIFT);
                clrbits_le32(&usbctlr->port_sc1, STS);
        }
 #else