diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-05-24 00:04:49 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-05-24 00:04:49 -0700 |
| commit | b7679ab3f70482ff4b75a8c735c8224ebedb6020 (patch) | |
| tree | 39fba8d730b08ce79090dab49851adffe13dc329 /arch/arm/mach-omap2/usb-musb.c | |
| parent | b08827f4c7a5020855abe0f9b1a316f11275b76b (diff) | |
| parent | 208466dc10083e734a8af71d10f923ee4bff950c (diff) | |
| download | linux-stable-b7679ab3f70482ff4b75a8c735c8224ebedb6020.tar.gz linux-stable-b7679ab3f70482ff4b75a8c735c8224ebedb6020.tar.bz2 linux-stable-b7679ab3f70482ff4b75a8c735c8224ebedb6020.zip | |
Merge branch 'for-tony' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/usb-musb.c')
| -rw-r--r-- | arch/arm/mach-omap2/usb-musb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index dfa5a3cb5a17..c7ed540d868d 100644 --- a/arch/arm/mach-omap2/usb-musb.c +++ b/arch/arm/mach-omap2/usb-musb.c @@ -129,11 +129,6 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data) else board_data = &musb_default_board_data; - if (cpu_is_omap3517() || cpu_is_omap3505()) { - } else if (cpu_is_omap44xx()) { - usb_musb_mux_init(board_data); - } - /* * REVISIT: This line can be removed once all the platforms using * musb_core.c have been converted to use use clkdev. @@ -176,10 +171,15 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data) dev->dma_mask = &musb_dmamask; dev->coherent_dma_mask = musb_dmamask; put_device(dev); + + if (cpu_is_omap44xx()) + omap4430_phy_init(dev); } #else void __init usb_musb_init(struct omap_musb_board_data *board_data) { + if (cpu_is_omap44xx()) + omap4430_phy_init(NULL); } #endif /* CONFIG_USB_MUSB_SOC */ |