From: Tom Rix <Tom.Rix@windriver.com>
Date: Sat, 31 Oct 2009 17:37:46 +0000 (-0500)
Subject: OMAP3 USB Initialize twl4030 only if required
X-Git-Tag: v2010.03-rc1~196^2~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ae4caf2fb53cc7be5d59a649b8aee86d542cbb6f;p=u-boot

OMAP3 USB Initialize twl4030 only if required

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>
---

diff --git a/drivers/usb/musb/omap3.c b/drivers/usb/musb/omap3.c
index 3e502e7d85..ea98c3cac1 100644
--- a/drivers/usb/musb/omap3.c
+++ b/drivers/usb/musb/omap3.c
@@ -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 */