Skip to contentSkip to conversation

da8xx/hawkboard: Add support for ohci host controller

PATCH New Sughosh Ganu 2 participants 4 messages Aug 9, 2012 – Aug 24, 2012

Subsystems (4)
Arm (32-bit) USB MUSB multipoint high speed dual-role controller USB ohci driver
lore
Share & tools
lore

Sughosh Ganu

author
#0 lore raw

PATCH 1/1 da8xx/hawkboard: Add support for ohci host controller

Also enable the ohci port on hawkboard. These additions result in an increased u-boot size -- adjust the same accordingly in the board's config.

Move the usb header for da8xx platforms under arch-davinci.

Signed-off-by Sughosh Ganu <[email protected]>
---
 arch/arm/cpu/arm926ejs/davinci/psc.c               |    5 ++
 .../arm/include/asm/arch-davinci/da8xx-usb.h       |    7 ++-
 arch/arm/include/asm/arch-davinci/hardware.h       |    1 +
 board/davinci/da8xxevm/hawkboard.c                 |   41 +++++++++++++++++
 drivers/usb/host/Makefile                          |    1 +
 drivers/usb/host/ohci-da8xx.c                      |   48 ++++++++++++++++++++
 drivers/usb/musb/da8xx.c                           |    3 +-
 include/configs/hawkboard.h                        |   14 +++++-
 8 files changed, 116 insertions(+), 4 deletions(-)
 rename drivers/usb/musb/da8xx.h => arch/arm/include/asm/arch-davinci/da8xx-usb.h (96%)
 create mode 100644 drivers/usb/host/ohci-da8xx.c
arch/arm/cpu/arm926ejs/davinci/psc.c +5 -0
index 3e92518..2ffb42a 100644
@@ -128,6 +128,11 @@ void lpsc_syncreset(unsigned int id)
 	lpsc_transition(id, 0x01);
 }
 
+void lpsc_disable(unsigned int id)
+{
+	lpsc_transition(id, 0x0);
+}
+
 /* Not all DaVinci chips have a DSP power domain. */
 #ifdef CONFIG_SOC_DM644X
arch/arm/include/asm/arch-davinci/da8xx-usb.h renamed from drivers/usb/musb/da8xx.h +5 -2
similarity index 96%
rename from drivers/usb/musb/da8xx.h
rename to arch/arm/include/asm/arch-davinci/da8xx-usb.h
index be1cdaf..eb79bf8 100644
@@ -1,5 +1,5 @@
 /*
- * da8xx.h -- TI's DA8xx platform specific usb wrapper definitions.
+ * da8xx-usb.h -- TI's DA8xx platform specific usb wrapper definitions.
  *
  * Author: Ajay Kumar Gupta <[email protected]>
  *

@@ -26,7 +26,6 @@
 
 #include <asm/arch/hardware.h>
 #include <asm/arch/gpio.h>
-#include "musb_core.h"
 
 /* Base address of da8xx usb0 wrapper */
 #define DA8XX_USB_OTG_BASE  0x01E00000

@@ -99,4 +98,8 @@ struct da8xx_usb_regs {
 #define CFGCHIP2_REFFREQ_48MHZ	(3 << 0)
 
 #define DA8XX_USB_VBUS_GPIO	(1 << 15)
+
+int usb_phy_on(void);
+void usb_phy_off(void);
+
 #endif	/* __DA8XX_MUSB_H__ */
arch/arm/include/asm/arch-davinci/hardware.h +1 -0
index b145c6e..2287929 100644
@@ -306,6 +306,7 @@ typedef volatile unsigned int *	dv_reg_p;
 
 void lpsc_on(unsigned int id);
 void lpsc_syncreset(unsigned int id);
+void lpsc_disable(unsigned int id);
 void dsp_on(void);
 
 void davinci_enable_uart0(void);
board/davinci/da8xxevm/hawkboard.c +41 -0

56 lines not on this page · raw message

drivers/usb/host/Makefile +1 -0
index 6de9164..bcb4662 100644
@@ -28,6 +28,7 @@ LIB	:= $(obj)libusb_host.o
 # ohci
 COBJS-$(CONFIG_USB_OHCI_NEW) += ohci-hcd.o
 COBJS-$(CONFIG_USB_ATMEL) += ohci-at91.o
+COBJS-$(CONFIG_USB_OHCI_DA8XX) += ohci-da8xx.o
 COBJS-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o
 COBJS-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
 COBJS-$(CONFIG_USB_S3C64XX) += s3c64xx-hcd.o
drivers/usb/host/ohci-da8xx.c new file +48 -0

48 lines not on this page · raw message

drivers/usb/musb/da8xx.c +2 -1
index 617d88e..653410a 100644
@@ -23,7 +23,8 @@
  */
 #include <common.h>
 
-#include "da8xx.h"
+#include "musb_core.h"
+#include <asm/arch/da8xx-usb.h>
 
 /* MUSB platform configuration */
 struct musb_config musb_cfg = {
include/configs/hawkboard.h +13 -1
index c6e9ce5..bc09c55 100644
@@ -136,7 +136,7 @@
 #define CONFIG_SYS_NAND_PAGE_SIZE	(2 << 10)
 #define CONFIG_SYS_NAND_BLOCK_SIZE	(128 << 10)
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0xe0000
-#define CONFIG_SYS_NAND_U_BOOT_SIZE	0x40000
+#define CONFIG_SYS_NAND_U_BOOT_SIZE	0x60000
 #define CONFIG_SYS_NAND_U_BOOT_DST	0xc1180000
 #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_NAND_U_BOOT_DST
 #define CONFIG_SYS_NAND_U_BOOT_RELOC_SP	(CONFIG_SYS_NAND_U_BOOT_DST - \

@@ -157,6 +157,16 @@
 
 #endif /* CONFIG_SYS_USE_NAND */
 
+/* USB Configs */
+#define CONFIG_SYS_USB_OHCI_CPU_INIT
+#define CONFIG_USB_OHCI_NEW
+#define CONFIG_USB_OHCI_DA8XX
+#define CONFIG_USB_STORAGE
+#define CONFIG_DOS_PARTITION
+#define CONFIG_SYS_USB_OHCI_REGS_BASE		0x01E25000
+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	15
+#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"hawkboard"
+
 /*
  * U-Boot general configuration
  */

@@ -199,6 +209,8 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SAVES
 #define CONFIG_CMD_MEMORY
+#define CONFIG_CMD_USB
+#define CONFIG_CMD_EXT2
 
 #ifdef CONFIG_CMD_BDI
 #define CONFIG_CLOCKS
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 1/1 da8xx/hawkboard: Add support for ohci host controller

Quoted 7 lines · Sughosh Ganu

Also enable the ohci port on hawkboard. These additions result in an increased u-boot size -- adjust the same accordingly in the board's config.

Move the usb header for da8xx platforms under arch-davinci.

Signed-off-by Sughosh Ganu <[email protected]>
Quoted 12 lines
---
 arch/arm/cpu/arm926ejs/davinci/psc.c               |    5 ++
 .../arm/include/asm/arch-davinci/da8xx-usb.h       |    7 ++-
 arch/arm/include/asm/arch-davinci/hardware.h       |    1 +
 board/davinci/da8xxevm/hawkboard.c                 |   41 +++++++++++++++++
 drivers/usb/host/Makefile                          |    1 +
 drivers/usb/host/ohci-da8xx.c                      |   48 ++++++++++++++++++++
 drivers/usb/musb/da8xx.c                           |    3 +-
 include/configs/hawkboard.h                        |   14 +++++-
 8 files changed, 116 insertions(+), 4 deletions(-)
 rename drivers/usb/musb/da8xx.h => arch/arm/include/asm/arch-davinci/da8xx-usb.h (96%)
 create mode 100644 drivers/usb/host/ohci-da8xx.c

Tom, do you have any comments on this patch. If not, can this be applied.

-sughosh

#2 lore raw

PATCH 1/1 da8xx/hawkboard: Add support for ohci host controller

Quoted 21 lines · Sughosh Ganu
Quoted 7 lines · Sughosh Ganu

Also enable the ohci port on hawkboard. These additions result in an increased u-boot size -- adjust the same accordingly in the board's config.

Move the usb header for da8xx platforms under arch-davinci.

Signed-off-by Sughosh Ganu <[email protected]>
Quoted 12 lines
---
 arch/arm/cpu/arm926ejs/davinci/psc.c               |    5 ++
 .../arm/include/asm/arch-davinci/da8xx-usb.h       |    7 ++-
 arch/arm/include/asm/arch-davinci/hardware.h       |    1 +
 board/davinci/da8xxevm/hawkboard.c                 |   41 +++++++++++++++++
 drivers/usb/host/Makefile                          |    1 +
 drivers/usb/host/ohci-da8xx.c                      |   48 ++++++++++++++++++++
 drivers/usb/musb/da8xx.c                           |    3 +-
 include/configs/hawkboard.h                        |   14 +++++-
 8 files changed, 116 insertions(+), 4 deletions(-)
 rename drivers/usb/musb/da8xx.h => arch/arm/include/asm/arch-davinci/da8xx-usb.h (96%)
 create mode 100644 drivers/usb/host/ohci-da8xx.c
Quoted 2 lines

Tom, do you have any comments on this patch. If not, can this be applied.

I'll give things another quick review this week. Been focused on the SPL series I posted last week :) Thanks!

Signature · 1 line
Tom
#3 lore raw

PATCH 1/1 da8xx/hawkboard: Add support for ohci host controller

In reply to Sughosh Ganu
Quoted 7 lines · Sughosh Ganu

Also enable the ohci port on hawkboard. These additions result in an increased u-boot size -- adjust the same accordingly in the board's config.

Move the usb header for da8xx platforms under arch-davinci.

Signed-off-by Sughosh Ganu <[email protected]>

Queued up to u-boot-ti/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120824/6c945d70/attachment.pgp>