summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorTom Rix <Tom.Rix@windriver.com>2009-10-31 12:37:46 -0500
committerRemy Bohmer <linux@bohmer.net>2009-12-20 12:51:51 +0100
commitae4caf2fb53cc7be5d59a649b8aee86d542cbb6f (patch)
treee75e6e6898851fbff69d3ee74b89a951624842d5 /drivers/usb
parent2ec1abea4359b94523d45a20d68d8582e09ace46 (diff)
downloadu-boot-imx-ae4caf2fb53cc7be5d59a649b8aee86d542cbb6f.zip
u-boot-imx-ae4caf2fb53cc7be5d59a649b8aee86d542cbb6f.tar.gz
u-boot-imx-ae4caf2fb53cc7be5d59a649b8aee86d542cbb6f.tar.bz2
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>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/musb/omap3.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/usb/musb/omap3.c b/drivers/usb/musb/omap3.c
index 3e502e7..ea98c3c 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 */