Patchwork [U-Boot,v2,2/2] AT91: at91sam9m10g45ek : Enable EHCI instead OHCI

login
register
mail settings
Submitter Bo Shen
Date June 26, 2012, 2:21 a.m.
Message ID <1340677288-8041-3-git-send-email-voice.shen@atmel.com>
Download mbox | patch
Permalink /patch/167290/
State Accepted
Commit e1edd06594f41a53cbc3344db78b3093ccb84bf3
Delegated to: Andreas Bießmann
Headers show

Comments

Bo Shen - June 26, 2012, 2:21 a.m.
Enable EHCI support instead OHCI

Signed-off-by: Bo Shen <voice.shen@atmel.com>
---
 include/configs/at91sam9m10g45ek.h |   20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)
Andreas Bießmann - June 27, 2012, 2:01 p.m.
On 26.06.2012 04:21, Bo Shen wrote:
> Enable EHCI support instead OHCI
> 
> Signed-off-by: Bo Shen <voice.shen@atmel.com>

I have no style objections.
Marek, would you take this and apply it in your usb tree (to have the
providing code and user side by side) or should I take it?

Acked-by: Andreas Bießmann <andreas.devel@googlemail.com>

> ---
>  include/configs/at91sam9m10g45ek.h |   20 +++-----------------
>  1 file changed, 3 insertions(+), 17 deletions(-)
Marek Vasut - June 27, 2012, 2:13 p.m.
Dear Andreas Bießmann,

> On 26.06.2012 04:21, Bo Shen wrote:
> > Enable EHCI support instead OHCI
> > 
> > Signed-off-by: Bo Shen <voice.shen@atmel.com>
> 
> I have no style objections.
> Marek, would you take this and apply it in your usb tree (to have the
> providing code and user side by side) or should I take it?
> 
> Acked-by: Andreas Bießmann <andreas.devel@googlemail.com>

Take it

> > ---
> > 
> >  include/configs/at91sam9m10g45ek.h |   20 +++-----------------
> >  1 file changed, 3 insertions(+), 17 deletions(-)

Best regards,
Marek Vasut

Patch

diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index f8b3095..1d5fc8f 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -59,17 +59,6 @@ 
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define	CONFIG_USART_ID			ATMEL_ID_SYS
 
-/*
- * This needs to be defined for the OHCI code to work but it is defined as
- * ATMEL_ID_UHPHS in the CPU specific header files.
- */
-#define ATMEL_ID_UHP		ATMEL_ID_UHPHS
-
-/*
- * Specify the clock enable bit in the PMC_SCER register.
- */
-#define ATMEL_PMC_UHP		AT91SAM926x_PMC_UHP
-
 /* LCD */
 #define CONFIG_LCD
 #define LCD_BPP				LCD_COLOR8
@@ -147,13 +136,10 @@ 
 #define CONFIG_RESET_PHY_R
 
 /* USB */
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_OHCI_NEW
+#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_ATMEL
+#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS	2
 #define CONFIG_DOS_PARTITION
-#define CONFIG_SYS_USB_OHCI_CPU_INIT
-#define CONFIG_SYS_USB_OHCI_REGS_BASE	ATMEL_BASE_HCI
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME	"at91sam9g45"
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
 #define CONFIG_USB_STORAGE
 
 #define CONFIG_SYS_LOAD_ADDR		0x22000000	/* load address */