Skip to contentSkip to conversation

usb: tegra: Fix PHY configuration for Tegra 3

PATCH Superseded Stefan Agner 3 participants 4 messages Feb 14, 2014 – Feb 15, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 usb: tegra: Fix PHY configuration for Tegra 3

On Tegra 3, the PTS (parallel transceiver select) and STS (serial transceiver select) are part of the HOSTPC1_DEVLC_0 register rather than PORTSC1_0 register. Since the reset configuration usually matches the configured registers, this error did not show up on Tegra 3 devices.

Also clear the forced powerdown bit in the UTMIP_PLL_CFG2_0 register which brings USB2 in UTMI mode to work. This was clearly missing since the forced powerdown bit is set in reset by default for all USB ports.

Also use the slightly different bit fields of first USB, (USBD) on Tegra 2.

---
 drivers/usb/host/ehci-tegra.c | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)
drivers/usb/host/ehci-tegra.c +24 -4
index 0b42aa5..bd99bce 100644
@@ -461,6 +461,9 @@ static int init_utmi_usb_controller(struct fdt_usb *config)
 		if (config->periph_id == PERIPH_ID_USBD)
 			clrbits_le32(&clkrst->crc_utmip_pll_cfg2,
 				     UTMIP_FORCE_PD_SAMP_A_POWERDOWN);
+		if (config->periph_id == PERIPH_ID_USB2)
+			clrbits_le32(&clkrst->crc_utmip_pll_cfg2,
+				     UTMIP_FORCE_PD_SAMP_B_POWERDOWN);
 		if (config->periph_id == PERIPH_ID_USB3)
 			clrbits_le32(&clkrst->crc_utmip_pll_cfg2,
 				     UTMIP_FORCE_PD_SAMP_C_POWERDOWN);
@@ -483,9 +486,21 @@ static int init_utmi_usb_controller(struct fdt_usb *config)
 	clrbits_le32(&usbctlr->icusb_ctrl, IC_ENB1);
 
 	/* Select UTMI parallel interface */
-	clrsetbits_le32(&usbctlr->port_sc1, PTS_MASK,
-			PTS_UTMI << PTS_SHIFT);
-	clrbits_le32(&usbctlr->port_sc1, STS);
+	if (!controller->has_hostpc) {
+		if (config->periph_id == PERIPH_ID_USBD) {
+			clrsetbits_le32(&usbctlr->port_sc1, PTS1_MASK,
+					PTS_UTMI << PTS1_SHIFT);
+			clrbits_le32(&usbctlr->port_sc1, STS1);
+		} else {
+			clrsetbits_le32(&usbctlr->port_sc1, PTS_MASK,
+					PTS_UTMI << PTS_SHIFT);
+			clrbits_le32(&usbctlr->port_sc1, STS);
+		}
+	} else {
+		clrsetbits_le32(&usbctlr->hostpc1_devlc, PTS_MASK,
+				PTS_UTMI << PTS_SHIFT);
+		clrbits_le32(&usbctlr->hostpc1_devlc, STS);
+	}
 
 	/* Deassert power down state */
 	clrbits_le32(&usbctlr->utmip_xcvr_cfg0, UTMIP_FORCE_PD_POWERDOWN |
@@ -543,7 +558,12 @@ static int init_ulpi_usb_controller(struct fdt_usb *config)
 			ULPI_CLKOUT_PINMUX_BYP | ULPI_OUTPUT_PINMUX_BYP);
 
 	/* Select ULPI parallel interface */
-	clrsetbits_le32(&usbctlr->port_sc1, PTS_MASK, PTS_ULPI << PTS_SHIFT);
+	if (!controller->has_hostpc) {
+		clrsetbits_le32(&usbctlr->port_sc1, PTS_MASK,
+				PTS_ULPI << PTS_SHIFT);
+	else
+		clrsetbits_le32(&usbctlr->hostpc1_devlc, PTS_MASK,
+				PTS_ULPI << PTS_SHIFT);
 
 	/* enable ULPI transceiver */
 	setbits_le32(&usbctlr->susp_ctrl, ULPI_PHY_ENB);
Signature · 1 line
1.8.5.4
#1 lore raw

PATCH v2 1/1 usb: tegra: Fix PHY configuration for Tegra 3

Am 2014-02-14 23:45, schrieb Stefan Agner:

drivers/usb/host/ehci-tegra.c static int init_ulpi_usb_controller(struct fdt_usb *config) · line 569

Quoted 11 lines
drivers/usb/host/ehci-tegra.c +6 -1
 	/* Select ULPI parallel interface */
-	clrsetbits_le32(&usbctlr->port_sc1, PTS_MASK, PTS_ULPI << PTS_SHIFT);
+	if (!controller->has_hostpc) {
+		clrsetbits_le32(&usbctlr->port_sc1, PTS_MASK,
+				PTS_ULPI << PTS_SHIFT);
+	else
+		clrsetbits_le32(&usbctlr->hostpc1_devlc, PTS_MASK,
+				PTS_ULPI << PTS_SHIFT);
 
 	/* enable ULPI transceiver */
 	setbits_le32(&usbctlr->susp_ctrl, ULPI_PHY_ENB);

Ok, just noticed that we need to address the different USBD register layout on Tegra 2 here too.

Furthermore, the code does not compile with Tegra 2 header file since the hostpc1_devlc field is missing there. The function ehci_get_port_speed uses a define and some calculation to work around this issue. Another solution would be to create a dummy field in the Tegra 2 USB register header file... Any thoughts on that?

#2 lore raw

PATCH v2 1/1 usb: tegra: Fix PHY configuration for Tegra 3

________________________________________
???: Stefan Agner [stefan at agner.ch]
????: 2014?2?15? ?? 06:52
???: u-boot at lists.denx.de; Jim Lin; Tom Warren; swarren at wwwdotorg.org; sjg at chromium.org; dev at lynxeye.de ??: Re: [PATCH v2] usb: tegra: Fix PHY configuration for Tegra 3

Am 2014-02-14 23:45, schrieb Stefan Agner:

drivers/usb/host/ehci-tegra.c static int init_ulpi_usb_controller(struct fdt_usb *config) · line 569

Quoted 11 lines
      /* Select ULPI parallel interface */
drivers/usb/host/ehci-tegra.c +6 -1
-     clrsetbits_le32(&usbctlr->port_sc1, PTS_MASK, PTS_ULPI << PTS_SHIFT);
+     if (!controller->has_hostpc) {
+             clrsetbits_le32(&usbctlr->port_sc1, PTS_MASK,
+                             PTS_ULPI << PTS_SHIFT);
+     else
+             clrsetbits_le32(&usbctlr->hostpc1_devlc, PTS_MASK,
+                             PTS_ULPI << PTS_SHIFT);
 
      /* enable ULPI transceiver */
      setbits_le32(&usbctlr->susp_ctrl, ULPI_PHY_ENB);

Ok, just noticed that we need to address the different USBD register layout on Tegra 2 here too.

Furthermore, the code does not compile with Tegra 2 header file since the hostpc1_devlc field is missing there. The function ehci_get_port_speed uses a define and some calculation to work around this issue. Another solution would be to create a dummy field in the Tegra 2 USB register header file... Any thoughts on that?

[Jim} Try use
usbctlr->usb_cmd + HOSTPC1_DEVLC
instead of usbctlr->hostpc1_devlc

--nvpublic

#3 lore raw

PATCH v2 1/1 usb: tegra: Fix PHY configuration for Tegra 3

Quoted 29 lines · Jim Lin

________________________________________
???: Stefan Agner [stefan at agner.ch]
????: 2014?2?15? ?? 06:52
???: u-boot at lists.denx.de; Jim Lin; Tom Warren; swarren at wwwdotorg.org; sjg at chromium.org; dev at lynxeye.de ??: Re: [PATCH v2] usb: tegra: Fix PHY configuration for Tegra 3

Am 2014-02-14 23:45, schrieb Stefan Agner:

drivers/usb/host/ehci-tegra.c static int init_ulpi_usb_controller(struct fdt_usb *config) · line 569

Quoted 11 lines
      /* Select ULPI parallel interface */
drivers/usb/host/ehci-tegra.c +6 -1
-     clrsetbits_le32(&usbctlr->port_sc1, PTS_MASK, PTS_ULPI << PTS_SHIFT);
+     if (!controller->has_hostpc) {
+             clrsetbits_le32(&usbctlr->port_sc1, PTS_MASK,
+                             PTS_ULPI << PTS_SHIFT);
+     else
+             clrsetbits_le32(&usbctlr->hostpc1_devlc, PTS_MASK,
+                             PTS_ULPI << PTS_SHIFT);
 
      /* enable ULPI transceiver */
      setbits_le32(&usbctlr->susp_ctrl, ULPI_PHY_ENB);

Ok, just noticed that we need to address the different USBD register layout on Tegra 2 here too.

Furthermore, the code does not compile with Tegra 2 header file since the hostpc1_devlc field is missing there. The function ehci_get_port_speed uses a define and some calculation to work around this issue. Another solution would be to create a dummy field in the Tegra 2 USB register header file... Any thoughts on that?

Quoted 3 lines

[Jim} Try use
usbctlr->usb_cmd + HOSTPC1_DEVLC
instead of usbctlr->hostpc1_devlc

I don't think we should mix register access styles. Either ifdef the driver so that only fields appropriate for the SoC being compiled for are accessed, or if the newer SoCs are just supersets of the earlier ones, mere the USB headers together so we don't need to split it up per SoC (and probably add comments indicating which fields are relevant for which SoCs). Actually, you could probably merge the headers even if you go down the ifdef route, to avoid duplicating 99% of the header for each SoC.