enable USB OHCI on sam9x5ek boards
Subsystems (4)
cover enable USB OHCI on sam9x5ek boards
This small patchset is based on current master ( 178d0cc1a4c73c3341afbeb2a93b172de8c96bd1 ) It enables usb ohci on at91sam9x5ek boards.
Tested it with a sam9g35 CPU and a usb key.
Richard Genoud (4):
usb documentation: fix typo
ARM: at91sam9x5: enable USB OHCI support for 9x5ek board.
at91sam9x5ek: regroup FAT/DOS features
at91sam9x5ek: add USB OHCI configuration
arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c | 9 +++++++++ arch/arm/include/asm/arch-at91/at91sam9x5.h | 2 ++ board/atmel/at91sam9x5ek/at91sam9x5ek.c | 3 +++ doc/README.usb | 2 +- drivers/usb/host/ohci-at91.c | 6 ++++-- include/configs/at91sam9x5ek.h | 18 +++++++++++++++++- 6 files changed, 36 insertions(+), 4 deletions(-)
Signature · 1 line
1.7.2.5
PATCH 1/4 usb documentation: fix typo
--- doc/README.usb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
doc/README.usb +1 -1
@@ -63,7 +63,7 @@ Common USB Commands: Storage USB Commands: - usb scan: scans the USB for storage devices.The USB must be running for this command (usb start) -- usb device [dev]: show or set current USB staorage device +- usb device [dev]: show or set current USB storage device - usb part [dev]: print partition table of one or all USB storage devices - usb read addr blk# cnt:
Signature · 1 line
1.7.2.5
PATCH 2/4 ARM: at91sam9x5: enable USB OHCI support for 9x5ek board.
In reply to Richard Genoud--- arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c | 9 +++++++++ arch/arm/include/asm/arch-at91/at91sam9x5.h | 2 ++ board/atmel/at91sam9x5ek/at91sam9x5ek.c | 3 +++ drivers/usb/host/ohci-at91.c | 6 ++++-- 4 files changed, 18 insertions(+), 2 deletions(-)
arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c +9 -0
@@ -193,6 +193,15 @@ void at91_spi1_hw_init(unsigned long cs_mask) }#endif +#ifdef CONFIG_USB_OHCI_NEW +void at91_uhp_hw_init (void ) +{ +/* Enable VBus on UHP ports */ +at91_set_pio_output (AT91_PIO_PORTD ,19 ,0 ); +at91_set_pio_output (AT91_PIO_PORTD ,20 ,0 ); +} +#endif +#ifdef CONFIG_MACB void at91_macb_hw_init (void ) {
arch/arm/include/asm/arch-at91/at91sam9x5.h +2 -0
@@ -154,6 +154,8 @@#define ATMEL_PIO_PORTS 4#define CPU_HAS_PIO3 #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
board/atmel/at91sam9x5ek/at91sam9x5ek.c +3 -0
@@ -295,6 +295,9 @@ int board_init(void)at91_macb_hw_init ();#endif +#ifdef CONFIG_USB_OHCI_NEW +at91_uhp_hw_init (); +#endif #ifdef CONFIG_LCD at91sam9x5ek_lcd_hw_init ();#endif
drivers/usb/host/ohci-at91.c +4 -2
@@ -41,7 +41,8 @@ int usb_cpu_init(void)writel (get_pllb_init (), &pmc->pllbr);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 */ writel (readl (&pmc->uckr) |AT91_PMC_UPLLEN |AT91_PMC_BIASEN , &pmc->uckr);
@@ -81,7 +82,8 @@ int usb_cpu_stop(void)writel (0 , &pmc->pllbr);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 */ writel (readl (&pmc->uckr) & (~AT91_PMC_UPLLEN ), &pmc->uckr);while ((readl (&pmc->sr) &AT91_PMC_LOCKU ) ==AT91_PMC_LOCKU )
Signature · 1 line
1.7.2.5
PATCH 3/4 at91sam9x5ek: regroup FAT/DOS features
In reply to Richard Genoud--- include/configs/at91sam9x5ek.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
include/configs/at91sam9x5ek.h +5 -1
@@ -90,6 +90,7 @@#define CONFIG_CMD_NAND #define CONFIG_CMD_SF #define CONFIG_CMD_MMC +#define CONFIG_CMD_FAT /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1
@@ -142,9 +143,12 @@/* MMC */ #ifdef CONFIG_CMD_MMC #define CONFIG_MMC -#define CONFIG_CMD_FAT #define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI +#endif + +/* FAT */ +#ifdef CONFIG_CMD_FAT #define CONFIG_DOS_PARTITION #endif
Signature · 1 line
1.7.2.5
PATCH 4/4 at91sam9x5ek: add USB OHCI configuration
In reply to Richard Genoud--- include/configs/at91sam9x5ek.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)
include/configs/at91sam9x5ek.h +12 -0
@@ -91,6 +91,7 @@#define CONFIG_CMD_SF #define CONFIG_CMD_MMC #define CONFIG_CMD_FAT +#define CONFIG_CMD_USB /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1
@@ -158,6 +159,17 @@#define CONFIG_NET_RETRY_COUNT 20#define CONFIG_MACB_SEARCH_PHY +/* USB */ +#ifdef CONFIG_CMD_USB +#define CONFIG_USB_ATMEL +#define CONFIG_USB_OHCI_NEW +#define CONFIG_SYS_USB_OHCI_CPU_INIT +#define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00600000/* ATMEL_BASE_OHCI */ +#define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9x5" +#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 +#define CONFIG_USB_STORAGE +#endif +#define CONFIG_SYS_LOAD_ADDR 0x22000000/* load address */ #define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
Signature · 1 line
1.7.2.5
cover enable USB OHCI on sam9x5ek boards
In reply to Richard GenoudHi Richard Genoud,
Quoted 9 lines · Richard Genoud
This small patchset is based on current master (
178d0cc1a4c73c3341afbeb2a93b172de8c96bd1) It enables usb ohci on at91sam9x5ek boards.
Tested it with a sam9g35 CPU and a usb key.Richard Genoud (4):
usb documentation: fix typo
ARM: at91sam9x5: enable USB OHCI support for 9x5ek board.
at91sam9x5ek: regroup FAT/DOS features
at91sam9x5ek: add USB OHCI configuration
Thanks for your work.
I think if enable EHCI instead of OHCI will be better?
Best Regards,
Bo Shen
cover enable USB OHCI on sam9x5ek boards
2012/11/28 Bo Shen <[email protected]>:
Quoted 2 lines
Thanks for your work.
I think if enable EHCI instead of OHCI will be better?
Yes, I tried it, and it's working great.
I'll resend the serie with EHCI enable.
Richard.