aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-02-12 15:26:48 -0500
committerTony Lindgren <tony@atomide.com>2010-02-15 12:27:02 -0500
commita8eb7ca0cbb41c9cd379b8d2a2a5efb503aa65e9 (patch)
tree86901095aeb9e59815a6f95547cf68a9ec0b32e0 /drivers/usb/musb
parent088ef950dc0dd58d2f339e1616c9092fea923f06 (diff)
omap3: Replace ARCH_OMAP34XX with ARCH_OMAP3
Replace ARCH_OMAP34XX with ARCH_OMAP3 Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/usb/musb')
-rw-r--r--drivers/usb/musb/Kconfig6
-rw-r--r--drivers/usb/musb/musb_core.c2
-rw-r--r--drivers/usb/musb/musb_core.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index d9db86498022..b4c783c284ba 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -37,7 +37,7 @@ config USB_MUSB_SOC
37 depends on USB_MUSB_HDRC 37 depends on USB_MUSB_HDRC
38 default y if ARCH_DAVINCI 38 default y if ARCH_DAVINCI
39 default y if ARCH_OMAP2430 39 default y if ARCH_OMAP2430
40 default y if ARCH_OMAP34XX 40 default y if ARCH_OMAP3
41 default y if (BF54x && !BF544) 41 default y if (BF54x && !BF544)
42 default y if (BF52x && !BF522 && !BF523) 42 default y if (BF52x && !BF522 && !BF523)
43 43
@@ -48,7 +48,7 @@ comment "OMAP 243x high speed USB support"
48 depends on USB_MUSB_HDRC && ARCH_OMAP2430 48 depends on USB_MUSB_HDRC && ARCH_OMAP2430
49 49
50comment "OMAP 343x high speed USB support" 50comment "OMAP 343x high speed USB support"
51 depends on USB_MUSB_HDRC && ARCH_OMAP34XX 51 depends on USB_MUSB_HDRC && ARCH_OMAP3
52 52
53comment "Blackfin high speed USB Support" 53comment "Blackfin high speed USB Support"
54 depends on USB_MUSB_HDRC && ((BF54x && !BF544) || (BF52x && !BF522 && !BF523)) 54 depends on USB_MUSB_HDRC && ((BF54x && !BF544) || (BF52x && !BF522 && !BF523))
@@ -153,7 +153,7 @@ config MUSB_PIO_ONLY
153config USB_INVENTRA_DMA 153config USB_INVENTRA_DMA
154 bool 154 bool
155 depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY 155 depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
156 default ARCH_OMAP2430 || ARCH_OMAP34XX || BLACKFIN 156 default ARCH_OMAP2430 || ARCH_OMAP3 || BLACKFIN
157 help 157 help
158 Enable DMA transfers using Mentor's engine. 158 Enable DMA transfers using Mentor's engine.
159 159
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 5eb9318cff77..738efd8063b5 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1000,7 +1000,7 @@ static void musb_shutdown(struct platform_device *pdev)
1000 * more than selecting one of a bunch of predefined configurations. 1000 * more than selecting one of a bunch of predefined configurations.
1001 */ 1001 */
1002#if defined(CONFIG_USB_TUSB6010) || \ 1002#if defined(CONFIG_USB_TUSB6010) || \
1003 defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) 1003 defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
1004static ushort __initdata fifo_mode = 4; 1004static ushort __initdata fifo_mode = 4;
1005#else 1005#else
1006static ushort __initdata fifo_mode = 2; 1006static ushort __initdata fifo_mode = 2;
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 03d50909b078..5514c7ee85bd 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -562,7 +562,7 @@ extern void musb_hnp_stop(struct musb *musb);
562extern int musb_platform_set_mode(struct musb *musb, u8 musb_mode); 562extern int musb_platform_set_mode(struct musb *musb, u8 musb_mode);
563 563
564#if defined(CONFIG_USB_TUSB6010) || defined(CONFIG_BLACKFIN) || \ 564#if defined(CONFIG_USB_TUSB6010) || defined(CONFIG_BLACKFIN) || \
565 defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) 565 defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
566extern void musb_platform_try_idle(struct musb *musb, unsigned long timeout); 566extern void musb_platform_try_idle(struct musb *musb, unsigned long timeout);
567#else 567#else
568#define musb_platform_try_idle(x, y) do {} while (0) 568#define musb_platform_try_idle(x, y) do {} while (0)