diff options
| author | Maulik Mankad <x0082077@ti.com> | 2010-02-18 01:09:32 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-23 21:57:39 +0300 |
| commit | bce066836644f12b239b86bbfdd475d7b24b9a49 (patch) | |
| tree | 27484b45413022846731057d98e3b930d3278c59 /arch/arm/mach-omap2 | |
| parent | bdfa35118c3149bfa7f6b259ca528f455af07c72 (diff) | |
| download | linux-bce066836644f12b239b86bbfdd475d7b24b9a49.tar.xz | |
omap: musb: Add USB support to 4430 SDP board file
This patch adds support for Mentor USB to 4430 SDP board
file.
It also defines the base address for HS USB OTG controller
in OMAP4.
Also updates platform specfic structure with base address
and IRQ details.
Signed-off-by: Maulik Mankad <x0082077@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Felipe Balbi <felipe.balbi@nokia.com>
Cc: David Brownell <david-b@pacbell.net>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Olof Johansson <olof@lixom.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/usb-musb.c | 9 |
2 files changed, 17 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 793ce8f4e927..86b240e7aa7c 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -17,6 +17,7 @@ #include <linux/platform_device.h> #include <linux/io.h> #include <linux/gpio.h> +#include <linux/usb/otg.h> #include <mach/hardware.h> #include <asm/mach-types.h> @@ -27,6 +28,7 @@ #include <plat/common.h> #include <plat/control.h> #include <plat/timer-gp.h> +#include <plat/usb.h> #include <asm/hardware/gic.h> static struct platform_device sdp4430_lcd_device = { @@ -73,11 +75,19 @@ static void __init omap_4430sdp_init_irq(void) omap_gpio_init(); } +static struct omap_musb_board_data musb_board_data = { + .interface_type = MUSB_INTERFACE_UTMI, + .mode = MUSB_PERIPHERAL, + .power = 100, +}; static void __init omap_4430sdp_init(void) { platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices)); omap_serial_init(); + /* OMAP4 SDP uses internal transceiver so register nop transceiver */ + usb_nop_xceiv_register(); + usb_musb_init(&musb_board_data); } static void __init omap_4430sdp_map_io(void) diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index 2221a6ccdeee..d5bea43e9422 100644 --- a/arch/arm/mach-omap2/usb-musb.c +++ b/arch/arm/mach-omap2/usb-musb.c @@ -88,10 +88,15 @@ static struct platform_device musb_device = { void __init usb_musb_init(struct omap_musb_board_data *board_data) { - if (cpu_is_omap243x()) + if (cpu_is_omap243x()) { musb_resources[0].start = OMAP243X_HS_BASE; - else + } else if (cpu_is_omap34xx()) { musb_resources[0].start = OMAP34XX_HSUSB_OTG_BASE; + } else if (cpu_is_omap44xx()) { + musb_resources[0].start = OMAP44XX_HSUSB_OTG_BASE; + musb_resources[1].start = INT_44XX_HS_USB_MC; + musb_resources[2].start = INT_44XX_HS_USB_DMA; + } musb_resources[0].end = musb_resources[0].start + SZ_4K - 1; /* |