ehci-omap: fix for enabling the correct usb port

PATCH New Jeroen Hofstee 6 participants 7 messages Apr 19, 2012 – Apr 21, 2012

Subsystems (3)

USB USB ehci driver OMAP USB support

lore

Share & tools

lore

Jeroen Hofstee

author

2012-04-19 21:25 UTC #0 lore raw

PATCH 1/1 ehci-omap: fix for enabling the correct usb port

This is just a patch for the problem reported here:
http://lists.denx.de/pipermail/u-boot/2012-February/117580.html originally reported by Igor.

"Looks like this is copy paste error from my side,(for port2/3 it should have been bypass
for port2/3 rather its port1 set in bypass mode)"

I only submit the patch since it is missing in 2012.04-rc3 while the twister board depends on it. Maybe it is already somewhere in the reposistory, but I cannot find it.

note: the twister boards still needs an additional usb reset, don't know why.

U-Boot 2012.04-rc3-dirty (Apr 19 2012 - 21:38:38)

AM35XX-GP ES1.0, CPU-OPP2, L3-165MHz, Max CPU Clock 600 Mhz TAM3517 TWISTER Board + LPDDR/NAND

I2C:   ready
DRAM:  256 MiB
NAND:  512 MiB
MMC:   OMAP SD/MMC: 0
In:    serial
Out:   serial
Err:   serial
Die ID #746c0000000000000155dc1405011024
Net:   DaVinci-EMAC, smc911x-0
Hit any key to stop autoboot:  0

twister => usb start
(Re)start USB...
USB: Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
scanning bus for storage devices... 0 Storage Device(s) found
twister => usb reset
(Re)start USB...
USB: Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
scanning bus for storage devices... 0 Storage Device(s) found
twister => usb reset
(Re)start USB...
USB: Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
scanning bus for storage devices... 0 Storage Device(s) found
twister => usb reset
(Re)start USB...
USB: Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
scanning bus for storage devices... 0 Storage Device(s) found

Signed-off-by Jeroen Hofstee <[email protected]>

---
 drivers/usb/host/ehci-omap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/usb/host/ehci-omap.c +2 -2

index 00f787f..1ed7710 100644
@@ -200,12 +200,12 @@ int omap_ehci_hcd_init(struct omap_usbhs_board_data *usbhs_pdata)
 		if (is_ehci_phy_mode(usbhs_pdata->port_mode[1]))
 			clrbits_le32(&reg, OMAP_UHH_HOSTCONFIG_ULPI_P2_BYPASS);
 		else
-			setbits_le32(&reg, OMAP_UHH_HOSTCONFIG_ULPI_P1_BYPASS);
+			setbits_le32(&reg, OMAP_UHH_HOSTCONFIG_ULPI_P2_BYPASS);
 
 		if (is_ehci_phy_mode(usbhs_pdata->port_mode[2]))
 			clrbits_le32(&reg, OMAP_UHH_HOSTCONFIG_ULPI_P3_BYPASS);
 		else
-			setbits_le32(&reg, OMAP_UHH_HOSTCONFIG_ULPI_P1_BYPASS);
+			setbits_le32(&reg, OMAP_UHH_HOSTCONFIG_ULPI_P3_BYPASS);
 	} else if (rev == OMAP_USBHS_REV2) {
 		clrsetbits_le32(&reg, (OMAP_P1_MODE_CLEAR | OMAP_P2_MODE_CLEAR),
 					OMAP4_UHH_HOSTCONFIG_APP_START_CLK);

Signature · 1 line

1.7.5.4

Tom Rini

2012-04-19 22:42 UTC #1 lore raw

PATCH 1/1 ehci-omap: fix for enabling the correct usb port

Quoted 10 lines · Jeroen Hofstee

This is just a patch for the problem reported here:
http://lists.denx.de/pipermail/u-boot/2012-February/117580.html originally reported by Igor.
"Looks like this is copy paste error from my side,(for port2/3 it should have been bypass
for port2/3 rather its port1 set in bypass mode)"
I only submit the patch since it is missing in 2012.04-rc3 while the twister board depends on it. Maybe it is already somewhere in the reposistory, but I cannot find it.
note: the twister boards still needs an additional usb reset, don't know why.

I don't see any difference between the first usb start and the following resets, should there have been? Clearly, there's a problem, but lets see if we can fix all of it in time.. Thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120419/4e075b77/attachment.pgp>

Jeroen Hofstee

2012-04-20 06:43 UTC #2 lore raw

PATCH 1/1 ehci-omap: fix for enabling the correct usb port

Quoted 3 lines · Tom Rini

I don't see any difference between the first usb start and the following resets, should there have been? Clearly, there's a problem, but lets see if we can fix all of it in time.. Thanks!

Sorry, it was incomplete. The resets are just to indicate it is never working,
below is the complete listing. With the patch at least the usb works, it needs
an additional reset though (hence the resets without the patch as well).

Regards,
Jeroen

U-Boot 2012.04-rc3-dirty (Apr 19 2012 - 21:38:38)

AM35XX-GP ES1.0, CPU-OPP2, L3-165MHz, Max CPU Clock 600 Mhz TAM3517 TWISTER Board + LPDDR/NAND

I2C:   ready
DRAM:  256 MiB
NAND:  512 MiB
MMC:   OMAP SD/MMC: 0
In:    serial
Out:   serial
Err:   serial
Die ID #746c0000000000000155dc1405011024
Net:   DaVinci-EMAC, smc911x-0
Hit any key to stop autoboot:  0

=== with the patch ===
!note it needs usb reset

U-Boot 2012.04-rc3-dirty (Apr 19 2012 - 21:48:37)

AM35XX-GP ES1.0, CPU-OPP2, L3-165MHz, Max CPU Clock 600 Mhz TAM3517 TWISTER Board + LPDDR/NAND

I2C:   ready
DRAM:  256 MiB
NAND:  512 MiB
MMC:   OMAP SD/MMC: 0
In:    serial
Out:   serial
Err:   serial
Die ID #746c0000000000000155dc1405011024
Net:   DaVinci-EMAC, smc911x-0
Hit any key to stop autoboot:  0

Stefano Babic

2012-04-20 07:42 UTC #3 lore raw

PATCH 1/1 ehci-omap: fix for enabling the correct usb port

In reply to Tom Rini

Quoted 10 lines · Tom Rini

Quoted 9 lines · Jeroen Hofstee
This is just a patch for the problem reported here:
http://lists.denx.de/pipermail/u-boot/2012-February/117580.html originally reported by Igor.
"Looks like this is copy paste error from my side,(for port2/3 it should have been bypass
for port2/3 rather its port1 set in bypass mode)"
I only submit the patch since it is missing in 2012.04-rc3 while the twister board depends on it. Maybe it is already somewhere in the reposistory, but I cannot find it.

Quoted 6 lines

Quoted 1 line
note: the twister boards still needs an additional usb reset, don't know why.
I don't see any difference between the first usb start and the following resets, should there have been? Clearly, there's a problem, but lets see if we can fix all of it in time.. Thanks!

The issue was raised during the review of Govindraj's patch, it seems the wrong version was picked up.

Acked-by Stefano Babic <[email protected]>

Can you apply it for the release (this is clearly a fix) ?

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

Tom Rini

2012-04-20 15:24 UTC #4 lore raw

PATCH 1/1 ehci-omap: fix for enabling the correct usb port

Quoted 18 lines · Stefano Babic

Quoted 10 lines · Tom Rini
Quoted 9 lines · Jeroen Hofstee
This is just a patch for the problem reported here:
http://lists.denx.de/pipermail/u-boot/2012-February/117580.html originally reported by Igor.
"Looks like this is copy paste error from my side,(for port2/3 it should have been bypass
for port2/3 rather its port1 set in bypass mode)"
I only submit the patch since it is missing in 2012.04-rc3 while the twister board depends on it. Maybe it is already somewhere in the reposistory, but I cannot find it.
Quoted 6 lines
Quoted 1 line
note: the twister boards still needs an additional usb reset, don't know why.
I don't see any difference between the first usb start and the following resets, should there have been? Clearly, there's a problem, but lets see if we can fix all of it in time.. Thanks!

Quoted 6 lines

The issue was raised during the review of Govindraj's patch, it seems the wrong version was picked up.
Acked-by Stefano Babic <[email protected]>
Can you apply it for the release (this is clearly a fix) ?

OK:

Acked-by Tom Rini <[email protected]>

Wolfgang, can you pick this up out of patchwork? I've assigned it to you. Thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120420/d0dfd4ac/attachment.pgp>

Govindraj

2012-04-20 07:28 UTC #5 lore raw

PATCH 1/1 ehci-omap: fix for enabling the correct usb port

In reply to Jeroen Hofstee

Quoted 41 lines · Jeroen Hofstee

This is just a patch for the problem reported here:
http://lists.denx.de/pipermail/u-boot/2012-February/117580.html originally reported by Igor.
"Looks like this is copy paste error from my side,(for port2/3 it should have been bypass ?for port2/3 rather its port1 set in bypass mode)"
I only submit the patch since it is missing in 2012.04-rc3 while the twister board depends on it. Maybe it is already somewhere in the reposistory, but I cannot find it.
note: the twister boards still needs an additional usb reset, don't know why.
U-Boot 2012.04-rc3-dirty (Apr 19 2012 - 21:38:38)
AM35XX-GP ES1.0, CPU-OPP2, L3-165MHz, Max CPU Clock 600 Mhz TAM3517 TWISTER Board + LPDDR/NAND
I2C: ? ready
DRAM: ?256 MiB
NAND: ?512 MiB
MMC: ? OMAP SD/MMC: 0
In: ? ?serial
Out: ? serial
Err: ? serial
Die ID #746c0000000000000155dc1405011024
Net: ? DaVinci-EMAC, smc911x-0
Hit any key to stop autoboot: ?0
twister => usb start
(Re)start USB...
USB: ? Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
? ? ? scanning bus for storage devices... 0 Storage Device(s) found twister => usb reset
(Re)start USB...
USB: ? Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
? ? ? scanning bus for storage devices... 0 Storage Device(s) found twister => usb reset
(Re)start USB...
USB: ? Register 1313 NbrPorts 3
USB EHCI 1.00

Quoted 9 lines

scanning bus for devices... 1 USB Device(s) found
? ? ? scanning bus for storage devices... 0 Storage Device(s) found twister => usb reset
(Re)start USB...
USB: ? Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
? ? ? scanning bus for storage devices... 0 Storage Device(s) found

Yes it was a typo and Looks like the corrected patch was not picked up as in here:
http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/124620

FWIW

Acked-by Govindraj.R <govindraj.raja <at> ti.com>

Quoted 32 lines

Signed-off-by Jeroen Hofstee <[email protected]>
---
?drivers/usb/host/ehci-omap.c | ? ?4 ++--
?1 files changed, 2 insertions(+), 2 deletions(-)
drivers/usb/host/ehci-omap.c +0 -0
index 00f787f..1ed7710 100644
@@ -200,12 +200,12 @@ int omap_ehci_hcd_init(struct omap_usbhs_board_data *usbhs_pdata)
 ? ? ? ? ? ? ? ?if (is_ehci_phy_mode(usbhs_pdata->port_mode[1]))
 ? ? ? ? ? ? ? ? ? ? ? ?clrbits_le32(&reg, OMAP_UHH_HOSTCONFIG_ULPI_P2_BYPASS);
? ? ? ? ? ? ? ?else
- ? ? ? ? ? ? ? ? ? ? ? setbits_le32(&reg, OMAP_UHH_HOSTCONFIG_ULPI_P1_BYPASS);
+ ? ? ? ? ? ? ? ? ? ? ? setbits_le32(&reg, OMAP_UHH_HOSTCONFIG_ULPI_P2_BYPASS);
? ? ? ? ? ? ? ?if (is_ehci_phy_mode(usbhs_pdata->port_mode[2]))
? ? ? ? ? ? ? ? ? ? ? ?clrbits_le32(&reg, OMAP_UHH_HOSTCONFIG_ULPI_P3_BYPASS); ? ? ? ? ? ? ? ?else
- ? ? ? ? ? ? ? ? ? ? ? setbits_le32(&reg, OMAP_UHH_HOSTCONFIG_ULPI_P1_BYPASS);
+ ? ? ? ? ? ? ? ? ? ? ? setbits_le32(&reg, OMAP_UHH_HOSTCONFIG_ULPI_P3_BYPASS); ? ? ? ?} else if (rev == OMAP_USBHS_REV2) {
? ? ? ? ? ? ? ?clrsetbits_le32(&reg, (OMAP_P1_MODE_CLEAR | OMAP_P2_MODE_CLEAR), ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?OMAP4_UHH_HOSTCONFIG_APP_START_CLK); --
1.7.5.4
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Wolfgang Denk

Applied

2012-04-21 15:02 UTC #6 lore raw

PATCH 1/1 ehci-omap: fix for enabling the correct usb port

In reply to Jeroen Hofstee

Dear Jeroen Hofstee,

Quoted 51 lines · In message <[email protected]> you wrote:

This is just a patch for the problem reported here:
http://lists.denx.de/pipermail/u-boot/2012-February/117580.html originally reported by Igor.
"Looks like this is copy paste error from my side,(for port2/3 it should have been bypass
for port2/3 rather its port1 set in bypass mode)"
I only submit the patch since it is missing in 2012.04-rc3 while the twister board depends on it. Maybe it is already somewhere in the reposistory, but I cannot find it.
note: the twister boards still needs an additional usb reset, don't know why.
U-Boot 2012.04-rc3-dirty (Apr 19 2012 - 21:38:38)
AM35XX-GP ES1.0, CPU-OPP2, L3-165MHz, Max CPU Clock 600 Mhz TAM3517 TWISTER Board + LPDDR/NAND
I2C:   ready
DRAM:  256 MiB
NAND:  512 MiB
MMC:   OMAP SD/MMC: 0
In:    serial
Out:   serial
Err:   serial
Die ID #746c0000000000000155dc1405011024
Net:   DaVinci-EMAC, smc911x-0
Hit any key to stop autoboot:  0
twister => usb start
(Re)start USB...
USB: Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
scanning bus for storage devices... 0 Storage Device(s) found
twister => usb reset
(Re)start USB...
USB: Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
scanning bus for storage devices... 0 Storage Device(s) found
twister => usb reset
(Re)start USB...
USB: Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
scanning bus for storage devices... 0 Storage Device(s) found
twister => usb reset
(Re)start USB...
USB: Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
scanning bus for storage devices... 0 Storage Device(s) found

Quoted 4 lines

Signed-off-by Jeroen Hofstee <[email protected]>
---
 drivers/usb/host/ehci-omap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 4 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Thought for the day: What if there were no hypothetical situations?