Merge branch 'master' of git://git.denx.de/u-boot-avr32

[u-boot] / drivers / usb / musb / omap3.c

diff --git a/drivers/usb/musb/omap3.c b/drivers/usb/musb/omap3.c
index 3bfd0a085f8e353376bb8218534ccb59f900fe36..c7876ed094b1a8bd02eb552babea20db4fe61487 100644 (file)
--- a/drivers/usb/musb/omap3.c
+++ b/drivers/usb/musb/omap3.c
@@ -31,14 +31,15 @@
  */
 
 #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 +66,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
 
@@ -105,6 +111,11 @@ int musb_platform_init(void)
                        goto end;
                }
 #endif
+
+#ifdef CONFIG_TWL6030_POWER
+               twl6030_usb_device_settings();
+#endif
+
                otg = (struct omap3_otg_regs *)OMAP3_OTG_BASE;
 
                /* Set OTG to always be on */
@@ -119,6 +130,14 @@ 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_BASE + 0x33C);
+               *usbotghs_control = 0x15;
+#endif
                platform_needs_initialization = 0;
        }