omap4: multi-omap: Allow build to work
authorSantosh Shilimkar <santosh.shilimkar@ti.com>
Tue, 16 Feb 2010 13:59:20 +0000 (19:29 +0530)
committerTony Lindgren <tony@atomide.com>
Tue, 23 Feb 2010 18:57:40 +0000 (10:57 -0800)
The musb support is enabled in omap3 platforms. For omap4 only board
support is available and the driver still isn't supported.
Because of this build with omap3_defconfig used for multi-omap
doesn't work on omap4430 sdp.

This patch avoids usb_musb_init() by adding a cpu check
in the board file.

Thanks to Anand Gadiyar and Mankad Maulik for the suggestion
of patching board file instead of musb driver.

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/board-4430sdp.c

index 86b240e..029c6c9 100644 (file)
@@ -87,7 +87,9 @@ static void __init omap_4430sdp_init(void)
        omap_serial_init();
        /* OMAP4 SDP uses internal transceiver so register nop transceiver */
        usb_nop_xceiv_register();
-       usb_musb_init(&musb_board_data);
+       /* FIXME: allow multi-omap to boot until musb is updated for omap4 */
+       if (!cpu_is_omap44xx())
+               usb_musb_init(&musb_board_data);
 }
 
 static void __init omap_4430sdp_map_io(void)