Extra omap code in linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / usb-musb.c

diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index fc74e913c415523dcf3965468b6b374b98c9654f..927c2d91a036c15ec7d741bb1d822bc1be8f770b 100644 (file)
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -161,17 +161,15 @@ static struct platform_device nop_xceiv_device = {
 
 void __init usb_musb_init(void)
 {
-       if (cpu_is_omap243x())
+       if (cpu_is_omap243x()) {
                musb_resources[0].start = OMAP243X_HS_BASE;
-       else
+               musb_plat.clock = "usbhs_ick";
+       } else {
                musb_resources[0].start = OMAP34XX_HSUSB_OTG_BASE;
-       musb_resources[0].end = musb_resources[0].start + SZ_8K - 1;
+               musb_plat.clock = "hsotgusb_ick";
+       }
 
-       /*
-        * REVISIT: This line can be removed once all the platforms using
-        * musb_core.c have been converted to use use clkdev.
-        */
-       musb_plat.clock = "ick";
+       musb_resources[0].end = musb_resources[0].start + SZ_8K - 1;
 
 #ifdef CONFIG_NOP_USB_XCEIV
        if (platform_device_register(&nop_xceiv_device) < 0) {