diff options
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-omap2/mcbsp.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap2/usb-musb.c | 21 |
3 files changed, 5 insertions, 22 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index d3cc145814d0..cf3dd771a678 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/spi/spi.h> | 25 | #include <linux/spi/spi.h> |
26 | #include <linux/spi/ads7846.h> | 26 | #include <linux/spi/ads7846.h> |
27 | #include <linux/i2c/twl4030.h> | 27 | #include <linux/i2c/twl4030.h> |
28 | #include <linux/usb/otg.h> | ||
28 | 29 | ||
29 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
30 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
@@ -307,6 +308,10 @@ static void __init omap3_evm_init(void) | |||
307 | ARRAY_SIZE(omap3evm_spi_board_info)); | 308 | ARRAY_SIZE(omap3evm_spi_board_info)); |
308 | 309 | ||
309 | omap_serial_init(); | 310 | omap_serial_init(); |
311 | #ifdef CONFIG_NOP_USB_XCEIV | ||
312 | /* OMAP3EVM uses ISP1504 phy and so register nop transceiver */ | ||
313 | usb_nop_xceiv_register(); | ||
314 | #endif | ||
310 | usb_musb_init(); | 315 | usb_musb_init(); |
311 | ads7846_dev_init(); | 316 | ads7846_dev_init(); |
312 | } | 317 | } |
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c index a5c0f0435cd6..99b6e1546311 100644 --- a/arch/arm/mach-omap2/mcbsp.c +++ b/arch/arm/mach-omap2/mcbsp.c | |||
@@ -19,7 +19,6 @@ | |||
19 | 19 | ||
20 | #include <mach/irqs.h> | 20 | #include <mach/irqs.h> |
21 | #include <mach/dma.h> | 21 | #include <mach/dma.h> |
22 | #include <mach/irqs.h> | ||
23 | #include <mach/mux.h> | 22 | #include <mach/mux.h> |
24 | #include <mach/cpu.h> | 23 | #include <mach/cpu.h> |
25 | #include <mach/mcbsp.h> | 24 | #include <mach/mcbsp.h> |
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index d85296dc896c..739e59e8025c 100644 --- a/arch/arm/mach-omap2/usb-musb.c +++ b/arch/arm/mach-omap2/usb-musb.c | |||
@@ -155,20 +155,6 @@ static struct platform_device musb_device = { | |||
155 | .resource = musb_resources, | 155 | .resource = musb_resources, |
156 | }; | 156 | }; |
157 | 157 | ||
158 | #ifdef CONFIG_NOP_USB_XCEIV | ||
159 | static u64 nop_xceiv_dmamask = DMA_BIT_MASK(32); | ||
160 | |||
161 | static struct platform_device nop_xceiv_device = { | ||
162 | .name = "nop_usb_xceiv", | ||
163 | .id = -1, | ||
164 | .dev = { | ||
165 | .dma_mask = &nop_xceiv_dmamask, | ||
166 | .coherent_dma_mask = DMA_BIT_MASK(32), | ||
167 | .platform_data = NULL, | ||
168 | }, | ||
169 | }; | ||
170 | #endif | ||
171 | |||
172 | void __init usb_musb_init(void) | 158 | void __init usb_musb_init(void) |
173 | { | 159 | { |
174 | if (cpu_is_omap243x()) | 160 | if (cpu_is_omap243x()) |
@@ -183,13 +169,6 @@ void __init usb_musb_init(void) | |||
183 | */ | 169 | */ |
184 | musb_plat.clock = "ick"; | 170 | musb_plat.clock = "ick"; |
185 | 171 | ||
186 | #ifdef CONFIG_NOP_USB_XCEIV | ||
187 | if (platform_device_register(&nop_xceiv_device) < 0) { | ||
188 | printk(KERN_ERR "Unable to register NOP-XCEIV device\n"); | ||
189 | return; | ||
190 | } | ||
191 | #endif | ||
192 | |||
193 | if (platform_device_register(&musb_device) < 0) { | 172 | if (platform_device_register(&musb_device) < 0) { |
194 | printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n"); | 173 | printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n"); |
195 | return; | 174 | return; |