diff options
| author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2010-02-16 14:59:20 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-23 19:57:40 +0100 |
| commit | ae46ec77311b550be992339c1e01fc20bc65296e (patch) | |
| tree | 133a2fec88b4fff204ab53538af585df50970842 /arch/arm | |
| parent | ASoC: OMAP-McBSP: ASoC interface for McBSP sidetone (diff) | |
| download | linux-ae46ec77311b550be992339c1e01fc20bc65296e.tar.xz linux-ae46ec77311b550be992339c1e01fc20bc65296e.zip | |
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 <santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 86b240e7aa7c..029c6c9b3a6d 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) |