From: Santosh Shilimkar Date: Tue, 16 Feb 2010 13:59:20 +0000 (+0530) Subject: omap4: multi-omap: Allow build to work X-Git-Tag: v2.6.34-rc1~230^2~22 X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=ae46ec77311b550be992339c1e01fc20bc65296e;p=net-next-2.6.git omap4: multi-omap: Allow build to work 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 Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 86b240e7aa7..029c6c9b3a6 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -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)