Merge git://git.denx.de/u-boot-marvell

[u-boot] / drivers / usb / musb-new / omap2430.c

diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c
index b1c4dc7828518252c856e658ddf4c5c92863e1e6..31a280edba0e51f1a3c59ee0ada5d79b79cf4bfb 100644 (file)
--- a/drivers/usb/musb-new/omap2430.c
+++ b/drivers/usb/musb-new/omap2430.c
@@ -24,7 +24,6 @@
  * Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#define __UBOOT__
 #ifndef __UBOOT__
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -322,6 +321,7 @@ static int omap2430_musb_init(struct musb *musb)
 {
        u32 l;
        int status = 0;
+       unsigned long int start;
 #ifndef __UBOOT__
        struct device *dev = musb->controller;
        struct omap2430_glue *glue = dev_get_drvdata(dev->parent);
@@ -332,6 +332,21 @@ static int omap2430_musb_init(struct musb *musb)
                (struct omap_musb_board_data *)musb->controller;
 #endif
 
+       /* Reset the controller */
+       musb_writel(musb->mregs, OTG_SYSCONFIG, SOFTRST);
+
+       start = get_timer(0);
+
+       while (1) {
+               l = musb_readl(musb->mregs, OTG_SYSCONFIG);
+               if ((l & SOFTRST) == 0)
+                       break;
+
+               if (get_timer(start) > (CONFIG_SYS_HZ / 1000)) {
+                       dev_err(musb->controller, "MUSB reset is taking too long\n");
+                       return -ENODEV;
+               }
+       }
 
 #ifndef __UBOOT__
        /* We require some kind of external transceiver, hooked