minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-08 11:36:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

at91sam9x5: enable USB support for 9x5ek board.

Browse Source 
Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Acked-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
This commit is contained in:
Richard Genoud 2012-11-29 23:18:32 +00:00 committed by Andreas Bießmann
parent b8a7c46796
commit bcfc8976e5
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c
View File

@ -193,6 +193,19 @@ void at91_spi1_hw_init(unsigned long cs_mask)
} }
#endif #endif
#if defined(CONFIG_USB_OHCI_NEW) || defined(CONFIG_USB_EHCI)
void at91_uhp_hw_init(void)
{
/* Enable VBus on UHP ports */
at91_set_pio_output(AT91_PIO_PORTD, 18, 0); /* port A */
at91_set_pio_output(AT91_PIO_PORTD, 19, 0); /* port B */
#if defined(CONFIG_USB_OHCI_NEW)
/* port C is OHCI only */
at91_set_pio_output(AT91_PIO_PORTD, 20, 0); /* port C */
#endif
}
#endif
#ifdef CONFIG_MACB #ifdef CONFIG_MACB
void at91_macb_hw_init(void) void at91_macb_hw_init(void)
{ {

2
arch/arm/include/asm/arch-at91/at91sam9x5.h
View File

@ -154,6 +154,8 @@
#define ATMEL_PIO_PORTS 4 #define ATMEL_PIO_PORTS 4
#define CPU_HAS_PIO3 #define CPU_HAS_PIO3
#define PIO_SCDR_DIV (0x3fff << 0) /* Slow Clock Divider Mask */ #define PIO_SCDR_DIV (0x3fff << 0) /* Slow Clock Divider Mask */
#define ATMEL_PMC_UHP AT91SAM926x_PMC_UHP
#define ATMEL_ID_UHP ATMEL_ID_UHPHS
/* /*
* at91sam9x5 specific prototypes * at91sam9x5 specific prototypes

3
board/atmel/at91sam9x5ek/at91sam9x5ek.c
View File

@ -295,6 +295,9 @@ int board_init(void)
at91_macb_hw_init(); at91_macb_hw_init();
#endif #endif
#if defined(CONFIG_USB_OHCI_NEW) || defined(CONFIG_USB_EHCI)
at91_uhp_hw_init();
#endif
#ifdef CONFIG_LCD #ifdef CONFIG_LCD
at91sam9x5ek_lcd_hw_init(); at91sam9x5ek_lcd_hw_init();
#endif #endif

6
drivers/usb/host/ohci-at91.c
View File

@ -41,7 +41,8 @@ int usb_cpu_init(void)
writel(get_pllb_init(), &pmc->pllbr); writel(get_pllb_init(), &pmc->pllbr);
while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB) while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB)
; ;
#elif defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) #elif defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) || \
defined(CONFIG_AT91SAM9X5)
/* Enable UPLL */ /* Enable UPLL */
writel(readl(&pmc->uckr) | AT91_PMC_UPLLEN | AT91_PMC_BIASEN, writel(readl(&pmc->uckr) | AT91_PMC_UPLLEN | AT91_PMC_BIASEN,
&pmc->uckr); &pmc->uckr);
@ -81,7 +82,8 @@ int usb_cpu_stop(void)
writel(0, &pmc->pllbr); writel(0, &pmc->pllbr);
while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != 0) while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != 0)
; ;
#elif defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) #elif defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) || \
defined(CONFIG_AT91SAM9X5)
/* Disable UPLL */ /* Disable UPLL */
writel(readl(&pmc->uckr) & (~AT91_PMC_UPLLEN), &pmc->uckr); writel(readl(&pmc->uckr) & (~AT91_PMC_UPLLEN), &pmc->uckr);
while ((readl(&pmc->sr) & AT91_PMC_LOCKU) == AT91_PMC_LOCKU) while ((readl(&pmc->sr) & AT91_PMC_LOCKU) == AT91_PMC_LOCKU)