Skip to contentSkip to conversation

HS-USB support for 2430SDP

PATCH In review Kevin Hilman 2 participants 4 messages May 10, 2007 – May 16, 2007

Subsystems (6)
Arm (32-bit) USB Arm sub-architectures OMAP2+ support +2 more subsystems
lore
Share & tools
lore

Kevin Hilman

author
#0 lore raw

cover HS-USB support for 2430SDP

Here is base support for MUSB on the 2430SDP. It adds mux fixup and mux regs for HS-USB and the MUSB platform setup code. Currently works for gadget only.

Tested on OMAP2430SDP-v2.2 and v5.0.

Kevin

--

author
#1 lore raw

PATCH 1/2 ARM: OMAP: pin-mux fixups for 2430

Fix base register used for 2430 which is different from 2420. And add mux regs for HSUSB and McBSP

Signed-off-by Kevin Hilman <[email protected]>
---
 arch/arm/mach-omap2/mux.c            |   36 ++++++++++++++++++++++++++++++++++
 arch/arm/mach-omap2/prcm-regs.h      |    2 -
 arch/arm/plat-omap/mux.c             |    9 ++++----
 include/asm-arm/arch-omap/mux.h      |   37 +++++++++++++++++++++++++++++++++++
 include/asm-arm/arch-omap/omap24xx.h |    3 ++
 5 files changed, 81 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/mux.c +36 -0
Index: dev/arch/arm/mach-omap2/mux.c
===================================================================
@@ -167,6 +167,42 @@ MUX_CFG_24XX("B3__24XX_KBR5",		0x30,	3,	
 MUX_CFG_24XX("AA4_24XX_KBC2",		0xe7,	3,	0,	0,	1)
 MUX_CFG_24XX("B13_24XX_KBC6",		0x110,	3,	0,	0,	1)
 
+/* 2430 USB */
+MUX_CFG_24XX("AD9_2430_USB0_PUEN",	0x133,	4,	0,	0,	1)
+MUX_CFG_24XX("Y11_2430_USB0_VP",	0x134,	4,	0,	0,	1)
+MUX_CFG_24XX("AD7_2430_USB0_VM",	0x135,	4,	0,	0,	1)
+MUX_CFG_24XX("AE7_2430_USB0_RCV",	0x136,	4,	0,	0,	1)
+MUX_CFG_24XX("AD4_2430_USB0_TXEN",	0x137,	4,	0,	0,	1)
+MUX_CFG_24XX("AF9_2430_USB0_SE0",	0x138,	4,	0,	0,	1)
+MUX_CFG_24XX("AE6_2430_USB0_DAT",	0x139,	4,	0,	0,	1)
+MUX_CFG_24XX("AD24_2430_USB1_SE0",	0x107,	2,	0,	0,	1)
+MUX_CFG_24XX("AB24_2430_USB1_RCV",	0x108,	2,	0,	0,	1)
+MUX_CFG_24XX("Y25_2430_USB1_TXEN",	0x109,	2,	0,	0,	1)
+MUX_CFG_24XX("AA26_2430_USB1_DAT",	0x10A,	2,	0,	0,	1)
+
+/* 2430 HS-USB */
+MUX_CFG_24XX("AD9_2430_USB0HS_DATA3",	0x133,	0,	0,	0,	1)
+MUX_CFG_24XX("Y11_2430_USB0HS_DATA4",	0x134,	0,	0,	0,	1)
+MUX_CFG_24XX("AD7_2430_USB0HS_DATA5",	0x135,	0,	0,	0,	1)
+MUX_CFG_24XX("AE7_2430_USB0HS_DATA6",	0x136,	0,	0,	0,	1)
+MUX_CFG_24XX("AD4_2430_USB0HS_DATA2",	0x137,	0,	0,	0,	1)
+MUX_CFG_24XX("AF9_2430_USB0HS_DATA0",	0x138,	0,	0,	0,	1)
+MUX_CFG_24XX("AE6_2430_USB0HS_DATA1",	0x139,	0,	0,	0,	1)
+MUX_CFG_24XX("AE8_2430_USB0HS_CLK",	0x13A,	0,	0,	0,	1)
+MUX_CFG_24XX("AD8_2430_USB0HS_DIR",	0x13B,	0,	0,	0,	1)
+MUX_CFG_24XX("AE5_2430_USB0HS_STP",	0x13c,	0,	1,	1,	1)
+MUX_CFG_24XX("AE9_2430_USB0HS_NXT",	0x13D,	0,	0,	0,	1)
+MUX_CFG_24XX("AC7_2430_USB0HS_DATA7",	0x13E,	0,	0,	0,	1)
+
+/* 2430 McBSP */
+MUX_CFG_24XX("AC10_2430_MCBSP2_FSX",	0x012E,	1,	0,	0,	1)
+MUX_CFG_24XX("AD16_2430_MCBSP2_CLX",	0x012F,	1,	0,	0,	1)
+MUX_CFG_24XX("AE13_2430_MCBSP2_DX",	0x0130,	1,	0,	0,	1)
+MUX_CFG_24XX("AD13_2430_MCBSP2_DR",	0x0131,	1,	0,	0,	1)
+MUX_CFG_24XX("AC10_2430_MCBSP2_FSX_OFF",0x012E,	0,	0,	0,	1)
+MUX_CFG_24XX("AD16_2430_MCBSP2_CLX_OFF",0x012F,	0,	0,	0,	1)
+MUX_CFG_24XX("AE13_2430_MCBSP2_DX_OFF",	0x0130,	0,	0,	0,	1)
+MUX_CFG_24XX("AD13_2430_MCBSP2_DR_OFF",	0x0131,	0,	0,	0,	1)
 };
 
 int __init omap2_mux_init(void)
arch/arm/mach-omap2/prcm-regs.h +0 -2
Index: dev/arch/arm/mach-omap2/prcm-regs.h
===================================================================
@@ -350,9 +350,7 @@
 #endif
 
 /* IO CONFIG */
-#define OMAP24XX_CTRL_BASE		(L4_24XX_BASE)
 #define CONTROL_REG32(offset)		__REG32(OMAP24XX_CTRL_BASE + (offset))
-
 #define CONTROL_PADCONF_SPI1_NCS2	CONTROL_REG32(0x104)
 #define CONTROL_PADCONF_SYS_XTALOUT	CONTROL_REG32(0x134)
 #define CONTROL_PADCONF_UART1_RX	CONTROL_REG32(0x0C8)
arch/arm/plat-omap/mux.c +5 -4
Index: dev/arch/arm/plat-omap/mux.c
===================================================================
@@ -32,7 +32,6 @@
 
 #ifdef CONFIG_OMAP_MUX
 
-#define OMAP24XX_L4_BASE	0x48000000
 #define OMAP24XX_PULL_ENA	(1 << 3)
 #define OMAP24XX_PULL_UP	(1 << 4)
 

@@ -75,6 +74,7 @@ int __init_or_module omap_cfg_reg(const 
 	}
 
 	cfg = (struct pin_config *)&pin_table[index];
+#ifdef CONFIG_ARCH_OMAP24XX
 	if (cpu_is_omap24xx()) {
 		u8 reg = 0;
 

@@ -85,7 +85,7 @@ int __init_or_module omap_cfg_reg(const 
 			reg |= OMAP24XX_PULL_UP;
 #if defined(CONFIG_OMAP_MUX_DEBUG) || defined(CONFIG_OMAP_MUX_WARNINGS)
 		{
-			u8 orig = omap_readb(OMAP24XX_L4_BASE + cfg->mux_reg);
+			u8 orig = omap_readb(OMAP24XX_CTRL_BASE + cfg->mux_reg);
 			u8 debug = 0;
 
 #ifdef	CONFIG_OMAP_MUX_DEBUG

@@ -95,14 +95,15 @@ int __init_or_module omap_cfg_reg(const 
 			if (debug || warn)
 				printk("MUX: setup %s (0x%08x): 0x%02x -> 0x%02x\n",
 						cfg->name,
-						OMAP24XX_L4_BASE + cfg->mux_reg,
+						OMAP24XX_CTRL_BASE + cfg->mux_reg,
 						orig, reg);
 		}
 #endif
-		omap_writeb(reg, OMAP24XX_L4_BASE + cfg->mux_reg);
+		omap_writeb(reg, OMAP24XX_CTRL_BASE + cfg->mux_reg);
 
 		return 0;
 	}
+#endif /* ARCH_OMAP24XX */
 
 	/* Check the mux register in question */
 	if (cfg->mux_reg) {
include/asm-arm/arch-omap/mux.h +37 -0
Index: dev/include/asm-arm/arch-omap/mux.h
===================================================================
@@ -557,6 +557,43 @@ enum omap24xx_index {
 	B3__24XX_KBR5,
 	AA4_24XX_KBC2,
 	B13_24XX_KBC6,
+
+	/* 2430 USB */
+	AD9_2430_USB0_PUEN,
+	Y11_2430_USB0_VP,
+	AD7_2430_USB0_VM,
+	AE7_2430_USB0_RCV,
+	AD4_2430_USB0_TXEN,
+	AF9_2430_USB0_SE0,
+	AE6_2430_USB0_DAT,
+	AD24_2430_USB1_SE0,
+	AB24_2430_USB1_RCV,
+	Y25_2430_USB1_TXEN,
+	AA26_2430_USB1_DAT,
+
+	/* 2430 HS-USB */
+	AD9_2430_USB0HS_DATA3,
+	Y11_2430_USB0HS_DATA4,
+	AD7_2430_USB0HS_DATA5,
+	AE7_2430_USB0HS_DATA6,
+	AD4_2430_USB0HS_DATA2,
+	AF9_2430_USB0HS_DATA0,
+	AE6_2430_USB0HS_DATA1,
+	AE8_2430_USB0HS_CLK,
+	AD8_2430_USB0HS_DIR,
+	AE5_2430_USB0HS_STP,
+	AE9_2430_USB0HS_NXT,
+	AC7_2430_USB0HS_DATA7,
+
+	/* 2430 McBSP */
+	AC10_2430_MCBSP2_FSX,
+	AD16_2430_MCBSP2_CLX,
+	AE13_2430_MCBSP2_DX,
+	AD13_2430_MCBSP2_DR,
+	AC10_2430_MCBSP2_FSX_OFF,
+	AD16_2430_MCBSP2_CLX_OFF,
+	AE13_2430_MCBSP2_DX_OFF,
+	AD13_2430_MCBSP2_DR_OFF,
 };
 
 #ifdef	CONFIG_OMAP_MUX
include/asm-arm/arch-omap/omap24xx.h +3 -0
Index: dev/include/asm-arm/arch-omap/omap24xx.h
===================================================================
@@ -23,6 +23,7 @@
 #define OMAP24XX_32KSYNCT_BASE	(L4_24XX_BASE + 0x4000)
 #define OMAP24XX_PRCM_BASE	(L4_24XX_BASE + 0x8000)
 #define OMAP24XX_SDRC_BASE	(L3_24XX_BASE + 0x9000)
+#define OMAP24XX_CTRL_BASE	L4_24XX_BASE
 #endif
 
 #ifdef CONFIG_ARCH_OMAP2430

@@ -31,6 +32,8 @@
 #define OMAP243X_SMS_BASE	0x6C000000
 #define OMAP24XX_SDRC_BASE	0x6D000000
 #define OMAP243X_GPMC_BASE	0x6E000000
+#define OMAP243X_SCM_BASE	(L4_WK_243X_BASE + 0x2000)
+#define OMAP24XX_CTRL_BASE	OMAP243X_SCM_BASE
 #endif
 
 /* DSP SS */

--

author
#2 lore raw

PATCH 2/2 ARM: OMAP: Support for HS-USB on 2430SDP

In reply to Kevin Hilman

Currently only working in gadget mode.

Signed-off-by Kevin Hilman <[email protected]>
---
 arch/arm/mach-omap2/Makefile            |    3 
 arch/arm/mach-omap2/board-2430sdp-usb.c |   69 ++++++++++++
 arch/arm/mach-omap2/board-2430sdp.c     |    2 
 drivers/usb/musb/omap2430.c             |    9 +
 drivers/usb/musb/omap2430.h             |    3 
 drivers/usb/musb/plat_uds.c             |    1 
 include/asm-arm/arch-omap/hdrc_cnf.h    |  177 ++++++++++++++++++++++++++++++++
 include/asm-arm/arch-omap/irqs.h        |    4 
 include/asm-arm/arch-omap/omap24xx.h    |    1 
 9 files changed, 267 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/Makefile +2 -1
Index: dev/arch/arm/mach-omap2/Makefile
===================================================================
@@ -21,7 +21,8 @@ mmu_mach-objs			:= mmu.o
 obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o
 obj-$(CONFIG_MACH_OMAP_H4)		+= board-h4.o
 obj-$(CONFIG_MACH_OMAP_2430SDP)		+= board-2430sdp.o \
-					   board-2430sdp-flash.o
+					   board-2430sdp-flash.o \
+					   board-2430sdp-usb.o
 obj-$(CONFIG_MACH_OMAP_APOLLON)		+= board-apollon.o \
 					   board-apollon-keys.o
 obj-$(CONFIG_MACH_NOKIA_N800)		+= board-n800.o board-n800-flash.o \
arch/arm/mach-omap2/board-2430sdp-usb.c new file +69 -0

69 lines not on this page · raw message

arch/arm/mach-omap2/board-2430sdp.c +2 -0
Index: dev/arch/arm/mach-omap2/board-2430sdp.c
===================================================================
@@ -296,6 +296,7 @@ static int __init omap2430_i2c_init(void
 }
 
 extern void __init sdp2430_flash_init(void);
+extern void __init sdp2430_usb_init(void);
 
 static void __init omap_2430sdp_init(void)
 {

@@ -305,6 +306,7 @@ static void __init omap_2430sdp_init(voi
 	omap_serial_init();
 
 	sdp2430_flash_init();
+	sdp2430_usb_init();
 
 	spi_register_board_info(sdp2430_spi_board_info,
 				ARRAY_SIZE(sdp2430_spi_board_info));
drivers/usb/musb/omap2430.c +8 -1
Index: dev/drivers/usb/musb/omap2430.c
===================================================================
@@ -61,6 +61,12 @@ static void omap_vbus_power(struct musb 
 {
 }
 
+static void omap_set_vbus(struct musb *musb, int is_on)
+{
+	WARN_ON(is_on && is_peripheral_active(musb));
+	return omap_vbus_power(musb, is_on, 0);
+}
+
 int __init musb_platform_init(struct musb *musb)
 {
 	/* Erratum - reset value of STP has pull-down.

@@ -82,12 +88,13 @@ int __init musb_platform_init(struct mus
 			omap_readl(OTG_SYSSTATUS), omap_readl(OTG_INTERFSEL),
 			omap_readl(OTG_SIMENABLE));
 
+	musb->board_set_vbus = omap_set_vbus;
 	omap_vbus_power(musb, musb->board_mode == MUSB_HOST, 1);
 
 	return 0;
 }
 
-int __exit musb_platform_exit(struct musb *musb)
+int musb_platform_exit(struct musb *musb)
 {
 	omap_vbus_power(musb, 0 /*off*/, 1);
 	clk_disable(musb->clock);
drivers/usb/musb/omap2430.h +3 -0
Index: dev/drivers/usb/musb/omap2430.h
===================================================================
@@ -11,6 +11,9 @@
 #define __MUSB_OMAP243X_H__
 
 #ifdef CONFIG_ARCH_OMAP2430
+
+#include <asm/arch/usb.h>
+
 /*
  * OMAP2430-specific definitions
  */
drivers/usb/musb/plat_uds.c +1 -0
Index: dev/drivers/usb/musb/plat_uds.c
===================================================================
@@ -1997,6 +1997,7 @@ static struct platform_driver musb_drive
 		.bus		= &platform_bus_type,
 		.owner		= THIS_MODULE,
 	},
+	.probe		= musb_probe,
 	.remove		= __devexit_p(musb_remove),
 	.shutdown	= musb_shutdown,
 	.suspend	= musb_suspend,
include/asm-arm/arch-omap/hdrc_cnf.h new file +177 -0

177 lines not on this page · raw message

include/asm-arm/arch-omap/irqs.h +4 -0
Index: dev/include/asm-arm/arch-omap/irqs.h
===================================================================
@@ -279,6 +279,10 @@
 #define INT_24XX_USB_IRQ_OTG	80
 #define INT_24XX_MMC_IRQ	83
 
+#define	INT_243X_HS_USB_MC	92
+#define	INT_243X_HS_USB_DMA	93
+#define	INT_243X_CARKIT		94
+
 /* Max. 128 level 2 IRQs (OMAP1610), 192 GPIOs (OMAP730) and
  * 16 MPUIO lines */
 #define OMAP_MAX_GPIO_LINES	192
include/asm-arm/arch-omap/omap24xx.h +1 -0
Index: dev/include/asm-arm/arch-omap/omap24xx.h
===================================================================
@@ -34,6 +34,7 @@
 #define OMAP243X_GPMC_BASE	0x6E000000
 #define OMAP243X_SCM_BASE	(L4_WK_243X_BASE + 0x2000)
 #define OMAP24XX_CTRL_BASE	OMAP243X_SCM_BASE
+#define OMAP243X_HS_BASE	(L4_24XX_BASE + 0x000ac000)
 #endif
 
 /* DSP SS */

--

maintainer
#3 lore raw
In reply to Kevin Hilman
Quoted 5 lines · Kevin Hilman

Here is base support for MUSB on the 2430SDP. It adds mux fixup and mux regs for HS-USB and the MUSB platform setup code. Currently works for gadget only.

Tested on OMAP2430SDP-v2.2 and v5.0.

Pushing these today.

Tony