enable USB OHCI on sam9x5ek boards

PATCH Superseded Richard Genoud 2 participants 8 messages Nov 28, 2012 – Nov 30, 2012

Subsystems (4)

Arm (32-bit) USB Arm/Microchip (AT91) SoC support USB ohci driver

lore

Share & tools

lore

Richard Genoud

author

2012-11-28 11:48 UTC #0 lore raw

v2 cover enable USB OHCI on sam9x5ek boards

This small patchset is based on current master ( 178d0cc1a4c73c3341afbeb2a93b172de8c96bd1 ) It enables usb on at91sam9x5ek boards.
Tested on at91sam9x5ek with a sam9g35 CPU (+ usb key and mouse)

By default the 3 USB 1.1 ports (A, B and C) are enabled.
If CONFIG_USB_EHCI is defined, the 2 USB 2.0 ports (A and B) will be enabled.

changes from v1:
* VBUS for usb port A is enabled
* EHCI configuration is now present
* number of OHCI ports corrected (3 instead of 2)

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

Richard Genoud

author

2012-11-28 11:48 UTC #1 lore raw

PATCH v2 1/4 usb documentation: fix typo

Signed-off-by Richard Genoud <[email protected]>

---
 doc/README.usb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

doc/README.usb +1 -1

index ef1d6ba..b4c3ef5 100644
@@ -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

Richard Genoud

author

2012-11-28 11:48 UTC #2 lore raw

PATCH v2 2/4 at91sam9x5: enable USB support for 9x5ek board.

In reply to Richard Genoud

Signed-off-by Richard Genoud <[email protected]>

---
 arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c |   10 ++++++++++
 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, 19 insertions(+), 2 deletions(-)

arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c +10 -0

index 9348552..f2a05c8 100644
@@ -193,6 +193,16 @@ void at91_spi1_hw_init(unsigned long cs_mask)
 }
 #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 */
+	at91_set_pio_output(AT91_PIO_PORTD, 20, 0); /* port C */
+}
+#endif
+
 #ifdef CONFIG_MACB
 void at91_macb_hw_init(void)
 {

arch/arm/include/asm/arch-at91/at91sam9x5.h +2 -0

index 0e728c9..de0f1b1 100644
@@ -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

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

drivers/usb/host/ohci-at91.c +4 -2

index 9532dd9..efd711d 100644
@@ -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

Bo Shen

2012-11-29 05:22 UTC #3 lore raw

PATCH v2 2/4 at91sam9x5: enable USB support for 9x5ek board.

Hi Richard,

Quoted 16 lines · Richard Genoud

Signed-off-by Richard Genoud <[email protected]>

---
  arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c |   10 ++++++++++
  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, 19 insertions(+), 2 deletions(-)

arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c +0 -0

index 9348552..f2a05c8 100644
@@ -193,6 +193,16 @@ void at91_spi1_hw_init(unsigned long cs_mask)
  }
  #endif

arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c void at91_spi1_hw_init(unsigned long cs_mask) · line 205

Quoted 10 lines

arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c +10 -0

+#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 */
+	at91_set_pio_output(AT91_PIO_PORTD, 20, 0); /* port C */
+}
+#endif
+

As port C doesn't support EHCI, so, I think we should deal with this carefully.
---<8---
#if OHCI
#else EHCI
#endif
--->8---
I think this will be better.

Best Regards
Bo Shen

Richard Genoud

author

2012-11-30 09:06 UTC #4 lore raw

PATCH v2 2/4 at91sam9x5: enable USB support for 9x5ek board.

2012/11/29 Bo Shen <[email protected]>:
Hi !

Quoted 8 lines

As port C doesn't support EHCI, so, I think we should deal with this carefully.
---<8---
#if OHCI
#else EHCI
#endif
--->8---
I think this will be better.

yes, you're right, I'll change that

Richard Genoud

author

2012-11-28 11:48 UTC #5 lore raw

PATCH v2 3/4 at91sam9x5ek: regroup FAT/DOS features

In reply to Richard Genoud

Signed-off-by Richard Genoud <[email protected]>

---
 include/configs/at91sam9x5ek.h |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

include/configs/at91sam9x5ek.h +5 -1

index 71f765b..5e5f9c1 100644
@@ -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

Richard Genoud

author

2012-11-28 11:48 UTC #6 lore raw

PATCH v2 4/4 at91sam9x5ek: add USB configuration

In reply to Richard Genoud

Signed-off-by Richard Genoud <[email protected]>

---
 include/configs/at91sam9x5ek.h |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

include/configs/at91sam9x5ek.h +24 -0

index 5e5f9c1..fd2586d 100644
@@ -91,6 +91,14 @@
 #define CONFIG_CMD_SF
 #define CONFIG_CMD_MMC
 #define CONFIG_CMD_FAT
+#define CONFIG_CMD_USB
+
+/*
+ * define CONFIG_USB_EHCI to enable USB Hi-Speed (aka 2.0)
+ * NB: in this case, USB 1.1 devices won't be recognized.
+ */
+#undef CONFIG_USB_EHCI
+
 
 /* SDRAM */
 #define CONFIG_NR_DRAM_BANKS		1

@@ -158,6 +166,22 @@
 #define CONFIG_NET_RETRY_COUNT		20
 #define CONFIG_MACB_SEARCH_PHY
 
+/* USB */
+#ifdef CONFIG_CMD_USB
+#ifdef CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_ATMEL
+#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS	2
+#else
+#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	3
+#endif
+#define CONFIG_USB_ATMEL
+#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

Bo Shen

2012-11-29 05:22 UTC #7 lore raw

PATCH v2 4/4 at91sam9x5ek: add USB configuration

Quoted 11 lines · Richard Genoud

Signed-off-by Richard Genoud <[email protected]>

---
  include/configs/at91sam9x5ek.h |   24 ++++++++++++++++++++++++
  1 files changed, 24 insertions(+), 0 deletions(-)

include/configs/at91sam9x5ek.h +0 -0

index 5e5f9c1..fd2586d 100644
@@ -91,6 +91,14 @@
  #define CONFIG_CMD_SF

include/configs/at91sam9x5ek.h line 101

Quoted 10 lines

include/configs/at91sam9x5ek.h +8 -0

  #define CONFIG_CMD_MMC
  #define CONFIG_CMD_FAT
+#define CONFIG_CMD_USB
+
+/*
+ * define CONFIG_USB_EHCI to enable USB Hi-Speed (aka 2.0)
+ * NB: in this case, USB 1.1 devices won't be recognized.
+ */
+#undef CONFIG_USB_EHCI
+

Nowhere defined it, so no need undefined it.

Quoted 6 lines

include/configs/at91sam9x5ek.h +0 -0

  /* SDRAM */
  #define CONFIG_NR_DRAM_BANKS		1

@@ -158,6 +166,22 @@
  #define CONFIG_NET_RETRY_COUNT		20
  #define CONFIG_MACB_SEARCH_PHY

include/configs/at91sam9x5ek.h line 177

Quoted 10 lines

include/configs/at91sam9x5ek.h +9 -0

 
+/* USB */
+#ifdef CONFIG_CMD_USB
+#ifdef CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_ATMEL
+#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS	2
+#else
+#define CONFIG_USB_OHCI_NEW
+#define CONFIG_SYS_USB_OHCI_CPU_INIT
+#define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00600000	/* ATMEL_BASE_OHCI */

This has defined in arch/arm/include/asm/arch-at91/at91sam9x5.h. You can use it directly.

Quoted 11 lines

include/configs/at91sam9x5ek.h +7 -0

+#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9x5"
+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	3
+#endif
+#define CONFIG_USB_ATMEL
+#define CONFIG_USB_STORAGE
+#endif
+
  #define CONFIG_SYS_LOAD_ADDR		0x22000000	/* load address */
 
  #define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE