diff options
author | Maulik Mankad <x0082077@ti.com> | 2010-03-12 03:29:09 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 16:21:32 -0400 |
commit | fb9c58edf13fc30d160ce52018576a1d7d45d795 (patch) | |
tree | dc41e7f9ed4f3c8c8443e7afe03633d20ba445d6 /drivers/usb/musb | |
parent | c71b1b9c21fa8f73028ebe82b17f738d3bf327f5 (diff) |
USB: MUSB: Add OMAP4 support in MUSB driver
This patch adds CONFIG_ARCH_OMAP4 macro within
MUSB driver.
Signed-off-by: Maulik Mankad <x0082077@ti.com>
Cc: David Brownell <david-b@pacbell.net>
Cc: Sergei Shtylyov <sshtylyov@mvista.com>
Cc: Olof Johansson <olof@lixom.net>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/musb')
-rw-r--r-- | drivers/usb/musb/musb_core.c | 6 | ||||
-rw-r--r-- | drivers/usb/musb/musb_core.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 633272e6d321..28ff0330bcea 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c | |||
@@ -985,7 +985,8 @@ static void musb_shutdown(struct platform_device *pdev) | |||
985 | * more than selecting one of a bunch of predefined configurations. | 985 | * more than selecting one of a bunch of predefined configurations. |
986 | */ | 986 | */ |
987 | #if defined(CONFIG_USB_TUSB6010) || \ | 987 | #if defined(CONFIG_USB_TUSB6010) || \ |
988 | defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) | 988 | defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \ |
989 | || defined(CONFIG_ARCH_OMAP4) | ||
989 | static ushort __initdata fifo_mode = 4; | 990 | static ushort __initdata fifo_mode = 4; |
990 | #else | 991 | #else |
991 | static ushort __initdata fifo_mode = 2; | 992 | static ushort __initdata fifo_mode = 2; |
@@ -1456,7 +1457,8 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb) | |||
1456 | 1457 | ||
1457 | /*-------------------------------------------------------------------------*/ | 1458 | /*-------------------------------------------------------------------------*/ |
1458 | 1459 | ||
1459 | #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430) | 1460 | #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430) || \ |
1461 | defined(CONFIG_ARCH_OMAP4) | ||
1460 | 1462 | ||
1461 | static irqreturn_t generic_interrupt(int irq, void *__hci) | 1463 | static irqreturn_t generic_interrupt(int irq, void *__hci) |
1462 | { | 1464 | { |
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index 136f71cbd5e3..b22d02dea7d3 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h | |||
@@ -213,7 +213,8 @@ enum musb_g_ep0_state { | |||
213 | */ | 213 | */ |
214 | 214 | ||
215 | #if defined(CONFIG_ARCH_DAVINCI) || defined(CONFIG_ARCH_OMAP2430) \ | 215 | #if defined(CONFIG_ARCH_DAVINCI) || defined(CONFIG_ARCH_OMAP2430) \ |
216 | || defined(CONFIG_ARCH_OMAP3430) || defined(CONFIG_BLACKFIN) | 216 | || defined(CONFIG_ARCH_OMAP3430) || defined(CONFIG_BLACKFIN) \ |
217 | || defined(CONFIG_ARCH_OMAP4) | ||
217 | /* REVISIT indexed access seemed to | 218 | /* REVISIT indexed access seemed to |
218 | * misbehave (on DaVinci) for at least peripheral IN ... | 219 | * misbehave (on DaVinci) for at least peripheral IN ... |
219 | */ | 220 | */ |
@@ -596,7 +597,8 @@ extern void musb_hnp_stop(struct musb *musb); | |||
596 | extern int musb_platform_set_mode(struct musb *musb, u8 musb_mode); | 597 | extern int musb_platform_set_mode(struct musb *musb, u8 musb_mode); |
597 | 598 | ||
598 | #if defined(CONFIG_USB_TUSB6010) || defined(CONFIG_BLACKFIN) || \ | 599 | #if defined(CONFIG_USB_TUSB6010) || defined(CONFIG_BLACKFIN) || \ |
599 | defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) | 600 | defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \ |
601 | defined(CONFIG_ARCH_OMAP4) | ||
600 | extern void musb_platform_try_idle(struct musb *musb, unsigned long timeout); | 602 | extern void musb_platform_try_idle(struct musb *musb, unsigned long timeout); |
601 | #else | 603 | #else |
602 | #define musb_platform_try_idle(x, y) do {} while (0) | 604 | #define musb_platform_try_idle(x, y) do {} while (0) |