BOOT: Add RAW ramdisk support to bootz

[platform/kernel/u-boot.git] / common / usb_hub.c

diff --git a/common/usb_hub.c b/common/usb_hub.c
index 576e0e6..e0edaad 100644 (file)
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -109,6 +109,7 @@ static void usb_hub_power_on(struct usb_hub_device *hub)
 {
        int i;
        struct usb_device *dev;
+       unsigned pgood_delay = hub->desc.bPwrOn2PwrGood * 2;
 
        dev = hub->pusb_dev;
        /* Enable power to the ports */
@@ -116,8 +117,10 @@ static void usb_hub_power_on(struct usb_hub_device *hub)
        for (i = 0; i < dev->maxchild; i++) {
                usb_set_port_feature(dev, i + 1, USB_PORT_FEAT_POWER);
                USB_HUB_PRINTF("port %d returns %lX\n", i + 1, dev->status);
-               wait_ms(hub->desc.bPwrOn2PwrGood * 2);
        }
+
+       /* Wait at least 100 msec for power to become stable */
+       mdelay(max(pgood_delay, (unsigned)100));
 }
 
 void usb_hub_reset(void)
@@ -157,7 +160,7 @@ int hub_port_reset(struct usb_device *dev, int port,
        for (tries = 0; tries < MAX_TRIES; tries++) {
 
                usb_set_port_feature(dev, port + 1, USB_PORT_FEAT_RESET);
-               wait_ms(200);
+               mdelay(200);
 
                if (usb_get_port_status(dev, port + 1, &portsts) < 0) {
                        USB_HUB_PRINTF("get_port_status failed status %lX\n",
@@ -184,7 +187,7 @@ int hub_port_reset(struct usb_device *dev, int port,
                if (portstatus & USB_PORT_STAT_ENABLE)
                        break;
 
-               wait_ms(200);
+               mdelay(200);
        }
 
        if (tries == MAX_TRIES) {
@@ -229,7 +232,7 @@ void usb_hub_port_connect_change(struct usb_device *dev, int port)
                if (!(portstatus & USB_PORT_STAT_CONNECTION))
                        return;
        }
-       wait_ms(200);
+       mdelay(200);
 
        /* Reset the port */
        if (hub_port_reset(dev, port, &portstatus) < 0) {
@@ -237,7 +240,7 @@ void usb_hub_port_connect_change(struct usb_device *dev, int port)
                return;
        }
 
-       wait_ms(200);
+       mdelay(200);
 
        /* Allocate a new device struct for it */
        usb = usb_alloc_new_device();