Skip to contentSkip to conversation

usb documentation: fix typo

PATCH New richard.genoud at gmail.com 4 participants 11 messages Nov 30, 2012 – Dec 9, 2012 1 message not in the archive

Subsystems (4)
Arm (32-bit) USB Arm/Microchip (AT91) SoC support USB ohci driver
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 1354267114-3307-1-git-send-email-yes

richard.genoud at gmail.com

author
#1 lore raw

PATCH v3 1/4 usb documentation: fix typo

From: Richard Genoud <[email protected]>

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
Applied
#2 lore raw

PATCH v3 1/4 usb documentation: fix typo

Dear richard.genoud at gmail.com,

Quoted 3 lines

From: Richard Genoud <[email protected]>

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

Applied this patch, thanks. Next time please Cc me, that way you have better chance I'll notice the patch right away ;-)

Quoted 9 lines
---
 doc/README.usb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
doc/README.usb +0 -0
index ef1d6ba..b4c3ef5 100644

doc/README.usb Common USB Commands: · line 69

Quoted 8 lines
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:

Best regards,
Marek Vasut

author
#3 lore raw

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

In reply to a message not in the archive

From: Richard Genoud <[email protected]>

Signed-off-by Richard Genoud <[email protected]>
---
 arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c |   13 +++++++++++++
 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, 22 insertions(+), 2 deletions(-)
arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c +13 -0
index 9348552..0448c0b 100644
@@ -193,6 +193,19 @@ 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 */
+#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
 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
#4 lore raw

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

Quoted 3 lines · richard.genoud at gmail.com

From: Richard Genoud <[email protected]>

Signed-off-by Richard Genoud <[email protected]>
Acked-by Bo Shen <[email protected]
Quoted 83 lines
---
  arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c |   13 +++++++++++++
  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, 22 insertions(+), 2 deletions(-)
arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c +13 -0
index 9348552..0448c0b 100644
@@ -193,6 +193,19 @@ 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 */
+#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
  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)
#5 lore raw

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

In reply to richard.genoud at gmail.com

Dear richard.genoud at gmail.com,

Quoted 9 lines · richard.genoud at gmail.com

From: Richard Genoud <[email protected]>

Signed-off-by Richard Genoud <[email protected]>
---
  arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c |   13 +++++++++++++
  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, 22 insertions(+), 2 deletions(-)

applied to u-boot-atmel/master, thanks!

Best regards

Andreas Bie?mann

author
#6 lore raw

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

In reply to a message not in the archive

From: Richard Genoud <[email protected]>

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
#7 lore raw

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

Quoted 3 lines · richard.genoud at gmail.com

From: Richard Genoud <[email protected]>

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

Best Regards,
Bo Shen

Quoted 31 lines
---
  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
author
#9 lore raw

PATCH v3 4/4 at91sam9x5ek: add USB configuration

In reply to a message not in the archive

From: Richard Genoud <[email protected]>

Signed-off-by Richard Genoud <[email protected]>
---
 include/configs/at91sam9x5ek.h |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)
include/configs/at91sam9x5ek.h +23 -0
index 5e5f9c1..915714f 100644
@@ -91,6 +91,13 @@
 #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.
+ */
+
 
 /* SDRAM */
 #define CONFIG_NR_DRAM_BANKS		1

@@ -158,6 +165,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		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
#10 lore raw

PATCH v3 4/4 at91sam9x5ek: add USB configuration

Quoted 3 lines · richard.genoud at gmail.com

From: Richard Genoud <[email protected]>

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

Best Regards,
Bo Shen

Quoted 46 lines
---
  include/configs/at91sam9x5ek.h |   23 +++++++++++++++++++++++
  1 files changed, 23 insertions(+), 0 deletions(-)
include/configs/at91sam9x5ek.h +23 -0
index 5e5f9c1..915714f 100644
@@ -91,6 +91,13 @@
  #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.
+ */
+
 
  /* SDRAM */
  #define CONFIG_NR_DRAM_BANKS		1

@@ -158,6 +165,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		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