diff options
| author | Tom Rini <trini@ti.com> | 2014-06-10 20:37:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-06-10 20:37:00 -0400 |
| commit | 61e76f53708cf082ef9061a140b57df3513b8ba1 (patch) | |
| tree | 5a25ff73cda65afe0bfdaa1af7884ca0125ad288 /common | |
| parent | 76b21026ceb5a6a83fc53b0ecdf425f240318022 (diff) | |
| parent | 3d83e6752d5595351a47309aab0749984c5909b7 (diff) | |
| download | u-boot-61e76f53708cf082ef9061a140b57df3513b8ba1.tar.gz u-boot-61e76f53708cf082ef9061a140b57df3513b8ba1.tar.xz u-boot-61e76f53708cf082ef9061a140b57df3513b8ba1.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'common')
| -rw-r--r-- | common/usb_hub.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/common/usb_hub.c b/common/usb_hub.c index ffac0e743c..2add4b9792 100644 --- a/common/usb_hub.c +++ b/common/usb_hub.c @@ -35,10 +35,6 @@ #include <asm/4xx_pci.h> #endif -#ifndef CONFIG_USB_HUB_MIN_POWER_ON_DELAY -#define CONFIG_USB_HUB_MIN_POWER_ON_DELAY 100 -#endif - #define USB_BUFSIZ 512 static struct usb_hub_device hub_dev[USB_MAX_HUB]; @@ -138,8 +134,11 @@ static void usb_hub_power_on(struct usb_hub_device *hub) debug("port %d returns %lX\n", i + 1, dev->status); } - /* Wait for power to become stable */ - mdelay(max(pgood_delay, CONFIG_USB_HUB_MIN_POWER_ON_DELAY)); + /* + * Wait for power to become stable, + * plus spec-defined max time for device to connect + */ + mdelay(pgood_delay + 1000); } void usb_hub_reset(void) |