Patchwork [U-Boot] ARM: omap3: temporary disable USB on TAM3517 boards

login
register
mail settings
Submitter Stefano Babic
Date Jan. 16, 2012, 8:53 a.m.
Message ID <1326704008-18464-1-git-send-email-sbabic@denx.de>
Download mbox | patch
Permalink /patch/136260/
State Superseded
Headers show

Comments

Stefano Babic - Jan. 16, 2012, 8:53 a.m.
The TAM3517 boards require a patch for EHCI OMAP
that does not yet find a way to mainline. The patch
disables temporary USB until EHCI OMAP will be supported.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Cc: Tom Rini <tom.rini@gmail.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
---
 include/configs/tam3517-common.h |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
Wolfgang Denk - Jan. 16, 2012, 11:06 a.m.
Dear Stefano Babic,

In message <1326704008-18464-1-git-send-email-sbabic@denx.de> you wrote:
>
> +#undef CONFIG_CMD_USB
> +#ifdef CONFIG_CMD_USB

Please do not undef what is not defined in the first place.

Best regards,

Wolfgang Denk
Marek Vasut - Feb. 26, 2012, 11:10 p.m.
> The TAM3517 boards require a patch for EHCI OMAP
> that does not yet find a way to mainline. The patch
> disables temporary USB until EHCI OMAP will be supported.
> 
> Signed-off-by: Stefano Babic <sbabic@denx.de>
> Cc: Tom Rini <tom.rini@gmail.com>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> ---
>  include/configs/tam3517-common.h |    7 +++++--
>  1 files changed, 5 insertions(+), 2 deletions(-)
> 

Hi,

what's the status of this patch/patchset?

Thanks
M
Igor Grinberg - Feb. 27, 2012, 7:07 a.m.
On 02/27/12 01:10, Marek Vasut wrote:
>> The TAM3517 boards require a patch for EHCI OMAP
>> that does not yet find a way to mainline. The patch
>> disables temporary USB until EHCI OMAP will be supported.
>>
>> Signed-off-by: Stefano Babic <sbabic@denx.de>
>> Cc: Tom Rini <tom.rini@gmail.com>
>> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
>> ---
>>  include/configs/tam3517-common.h |    7 +++++--
>>  1 files changed, 5 insertions(+), 2 deletions(-)
>>
> 
> Hi,
> 
> what's the status of this patch/patchset?

Superseded by:
8c589d6f (OMAP3: TAM3517: update ehci interface)
Stefano Babic - Feb. 27, 2012, 8:48 a.m.
On 27/02/2012 00:10, Marek Vasut wrote:
>> The TAM3517 boards require a patch for EHCI OMAP
>> that does not yet find a way to mainline. The patch
>> disables temporary USB until EHCI OMAP will be supported.
>>
>> Signed-off-by: Stefano Babic <sbabic@denx.de>
>> Cc: Tom Rini <tom.rini@gmail.com>
>> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
>> ---
>>  include/configs/tam3517-common.h |    7 +++++--
>>  1 files changed, 5 insertions(+), 2 deletions(-)
>>
> 
> Hi,
> 
> what's the status of this patch/patchset?

The patch must be dropped - after I sent it, Govindraj's patches cleaned
up the code adding OMAP4 support and these patches are now mainline.
Everything is mainlined now, we need only to discharge this patch.

Stefano
Marek Vasut - Feb. 27, 2012, 1:53 p.m.
> On 27/02/2012 00:10, Marek Vasut wrote:
> >> The TAM3517 boards require a patch for EHCI OMAP
> >> that does not yet find a way to mainline. The patch
> >> disables temporary USB until EHCI OMAP will be supported.
> >> 
> >> Signed-off-by: Stefano Babic <sbabic@denx.de>
> >> Cc: Tom Rini <tom.rini@gmail.com>
> >> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> >> ---
> >> 
> >>  include/configs/tam3517-common.h |    7 +++++--
> >>  1 files changed, 5 insertions(+), 2 deletions(-)
> > 
> > Hi,
> > 
> > what's the status of this patch/patchset?
> 
> The patch must be dropped - after I sent it, Govindraj's patches cleaned
> up the code adding OMAP4 support and these patches are now mainline.
> Everything is mainlined now, we need only to discharge this patch.
> 
> Stefano

Updated status in patchwork, Thanks!

M

Patch

diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 817d468..081dbc8 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -97,12 +97,16 @@ 
 #define CONFIG_DOS_PARTITION
 
 /* EHCI */
+#undef CONFIG_CMD_USB
+#ifdef CONFIG_CMD_USB
 #define CONFIG_OMAP3_GPIO_5
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_OMAP
-#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO	25
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
 #define CONFIG_USB_STORAGE
+#endif
+
+#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO	25
 
 /* #define CONFIG_EHCI_DCACHE */
 
@@ -121,7 +125,6 @@ 
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_NAND		/* NAND support			*/
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_USB
 
 #undef CONFIG_CMD_FLASH		/* only NAND on the SOM */
 #undef CONFIG_CMD_IMLS