Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / drivers / usb / musb / omap3.c

diff --git a/drivers/usb/musb/omap3.c b/drivers/usb/musb/omap3.c
index 3e502e7d853dd9e2ca9e766a28c31bbf8b7eef2e..a395ebcc67e9685a138f8e6b3e1937b891db29a3 100644 (file)
--- a/drivers/usb/musb/omap3.c
+++ b/drivers/usb/musb/omap3.c
@@ -30,15 +30,17 @@
  * MA 02111-1307 USA
  */
 
+#include <asm/omap_common.h>
 #include <twl4030.h>
+#include <twl6030.h>
 #include "omap3.h"
 
 static int platform_needs_initialization = 1;
 
 struct musb_config musb_cfg = {
-       (struct musb_regs *)MENTOR_USB0_BASE,
-       OMAP3_USB_TIMEOUT,
-       0
+       .regs           = (struct musb_regs *)MENTOR_USB0_BASE,
+       .timeout        = OMAP3_USB_TIMEOUT,
+       .musb_speed     = 0,
 };
 
 /*
@@ -65,7 +67,12 @@ static struct omap3_otg_regs *otg;
 
 #define OMAP3_OTG_SYSSTATUS_RESETDONE                  0x0001
 
+/* OMAP4430 has an internal PHY, use it */
+#ifdef CONFIG_OMAP4430
+#define OMAP3_OTG_INTERFSEL_OMAP                       0x0000
+#else
 #define OMAP3_OTG_INTERFSEL_OMAP                       0x0001
+#endif
 
 #define OMAP3_OTG_FORCESTDBY_STANDBY                   0x0001
 
@@ -94,11 +101,21 @@ 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
+
+#ifdef CONFIG_TWL6030_POWER
+               twl6030_usb_device_settings();
+#endif
 
                otg = (struct omap3_otg_regs *)OMAP3_OTG_BASE;
 
@@ -114,11 +131,23 @@ int musb_platform_init(void)
                stdby &= ~OMAP3_OTG_FORCESTDBY_STANDBY;
                writel(stdby, &otg->forcestdby);
 
+#ifdef CONFIG_OMAP3_EVM
+               musb_cfg.extvbus = omap3_evm_need_extvbus();
+#endif
+
+#ifdef CONFIG_OMAP4430
+               u32 *usbotghs_control =
+                       (u32 *)((*ctrl)->control_usbotghs_ctrl);
+               *usbotghs_control = 0x15;
+#endif
                platform_needs_initialization = 0;
        }
 
        ret = platform_needs_initialization;
+
+#ifdef CONFIG_TWL4030_USB
 end:
+#endif
        return ret;
 
 }