OMAP3 USB Initialize twl4030 only if required
authorTom Rix <Tom.Rix@windriver.com>
Sat, 31 Oct 2009 17:37:46 +0000 (12:37 -0500)
committerRemy Bohmer <linux@bohmer.net>
Sun, 20 Dec 2009 11:51:51 +0000 (12:51 +0100)
OMAP3EVM uses ISP1504 phy and so twl4030 related init is not required.

Submitted-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
drivers/usb/musb/omap3.c

index 3e502e7d853dd9e2ca9e766a28c31bbf8b7eef2e..ea98c3cac172efe82037cfb84a9bdcf5f65a9cef 100644 (file)
@@ -94,12 +94,17 @@ int musb_platform_init(void)
        if (platform_needs_initialization) {
                u32 stdby;
 
+               /*
+                * OMAP3EVM uses ISP1504 phy and so
+                * twl4030 related init is not required.
+                */
+#ifdef CONFIG_TWL4030_USB
                if (twl4030_usb_ulpi_init()) {
                        serial_printf("ERROR: %s Could not initialize PHY\n",
                                __PRETTY_FUNCTION__);
                        goto end;
                }
-
+#endif
                otg = (struct omap3_otg_regs *)OMAP3_OTG_BASE;
 
                /* Set OTG to always be on */