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

[oweals/u-boot.git] / drivers / usb / musb / davinci.c

diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index a7648fc452be64f80867636f4214c7b7fa4f9e55..359c635bf6aff8ddf77edfb29166e2f58a789efc 100644 (file)
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -24,12 +24,17 @@
 #include <common.h>
 #include <asm/io.h>
 #include "davinci.h"
+#include <asm/arch/hardware.h>
+
+#if !defined(CONFIG_DV_USBPHY_CTL)
+#define CONFIG_DV_USBPHY_CTL (USBPHY_SESNDEN | USBPHY_VBDTCTEN)
+#endif
 
 /* MUSB platform configuration */
 struct musb_config musb_cfg = {
-       (struct musb_regs *)MENTOR_USB0_BASE,
-       DAVINCI_USB_TIMEOUT,
-       0
+       .regs           = (struct musb_regs *)MENTOR_USB0_BASE,
+       .timeout        = DAVINCI_USB_TIMEOUT,
+       .musb_speed     = 0,
 };
 
 /* MUSB module register overlay */
@@ -41,10 +46,25 @@ struct davinci_usb_regs *dregs;
 static u8 phy_on(void)
 {
        u32 timeout;
-
+#ifdef DAVINCI_DM365EVM
+       u32 val;
+#endif
        /* Wait until the USB phy is turned on */
-       writel(USBPHY_SESNDEN | USBPHY_VBDTCTEN, USBPHY_CTL_PADDR);
+#ifdef DAVINCI_DM365EVM
+       writel(USBPHY_PHY24MHZ | USBPHY_SESNDEN |
+                       USBPHY_VBDTCTEN, USBPHY_CTL_PADDR);
+#else
+       writel(CONFIG_DV_USBPHY_CTL, USBPHY_CTL_PADDR);
+#endif
        timeout = musb_cfg.timeout;
+
+#ifdef DAVINCI_DM365EVM
+       /* Set the ownership of GIO33 to USB */
+       val = readl(PINMUX4);
+       val &= ~(PINMUX4_USBDRVBUS_BITCLEAR);
+       val |= PINMUX4_USBDRVBUS_BITSET;
+       writel(val, PINMUX4);
+#endif
        while (timeout--)
                if (readl(USBPHY_CTL_PADDR) & USBPHY_PHYCLKGD)
                        return 1;
@@ -62,6 +82,17 @@ static void phy_off(void)
        writel(USBPHY_OSCPDWN | USBPHY_PHYPDWN, USBPHY_CTL_PADDR);
 }
 
+void __enable_vbus(void)
+{
+       /*
+        *  nothing to do, vbus is handled through the cpu.
+        *  Define this function in board code, if it is
+        *  different on your board.
+        */
+}
+void  enable_vbus(void)
+       __attribute__((weak, alias("__enable_vbus")));
+
 /*
  * This function performs Davinci platform specific initialization for usb0.
  */