diff mbox

[U-Boot] ehci-omap: fix for enabling the correct usb port

Message ID 1334870718-24065-1-git-send-email-jeroen@myspectrum.nl
State Accepted
Commit 90579fdd4179f2ed531b3bc69b76c7842fa29ab3
Delegated to: Wolfgang Denk
Headers show

Commit Message

Jeroen Hofstee April 19, 2012, 9:25 p.m. UTC
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 <jeroen@myspectrum.nl>
---
 drivers/usb/host/ehci-omap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Comments

Tom Rini April 19, 2012, 10:42 p.m. UTC | #1
On Thu, Apr 19, 2012 at 11:25:18PM +0200, Jeroen Hofstee 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.


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!
Jeroen Hofstee April 20, 2012, 6:43 a.m. UTC | #2
On 04/20/2012 12:42 AM, Tom Rini wrote:
> 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
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

=== 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
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... 3 USB Device(s) found
        scanning bus for storage devices... 1 Storage Device(s) found
Govindraj April 20, 2012, 7:28 a.m. UTC | #3
On Fri, Apr 20, 2012 at 2:55 AM, Jeroen Hofstee <jeroen@myspectrum.nl> 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
>

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>

>
> Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
> ---
>  drivers/usb/host/ehci-omap.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
> index 00f787f..1ed7710 100644
> --- a/drivers/usb/host/ehci-omap.c
> +++ b/drivers/usb/host/ehci-omap.c
> @@ -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@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
Stefano Babic April 20, 2012, 7:42 a.m. UTC | #4
On 20/04/2012 00:42, Tom Rini wrote:
> On Thu, Apr 19, 2012 at 11:25:18PM +0200, Jeroen Hofstee 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.
> 
> 
> 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 <sbabic@denx.de>

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

Best regards,
Stefano Babic
Tom Rini April 20, 2012, 3:24 p.m. UTC | #5
On Fri, Apr 20, 2012 at 09:42:46AM +0200, Stefano Babic wrote:
> On 20/04/2012 00:42, Tom Rini wrote:
> > On Thu, Apr 19, 2012 at 11:25:18PM +0200, Jeroen Hofstee 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.
> > 
> > 
> > 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 <sbabic@denx.de>
> 
> Can you apply it for the release (this is clearly a fix) ?

OK:

Acked-by: Tom Rini <trini@ti.com>

Wolfgang, can you pick this up out of patchwork?  I've assigned it to
you.  Thanks!
Wolfgang Denk April 21, 2012, 3:02 p.m. UTC | #6
Dear Jeroen Hofstee,

In message <1334870718-24065-1-git-send-email-jeroen@myspectrum.nl> 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
> 
> 
> Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
> ---
>  drivers/usb/host/ehci-omap.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 00f787f..1ed7710 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -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);