usb: hub: remove CONFIG_USB_HUB_MIN_POWER_ON_DELAY

Now that we wait the correct specification-mandated time at the end of
usb_hub_power_on(), I suspect that CONFIG_USB_HUB_MIN_POWER_ON_DELAY has
no purpose.

For cm_t35.h, we already wait longer than the original MIN_POWER_ON_DELAY,
so this change is safe.

For gw_ventana.h, we will wait as long as the original MIN_POWER_ON_DELAY
iff pgood_delay was at least 200ms. I'm not sure if this is the case or
not, hence I've CC'd relevant people to test this change.

Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>

diff --git a/README b/README
index a280435e9fbec65012cf9758a66f6827d2f22353..a085625841c8f84f29af35c269045a57a6b90d99 100644 (file)
--- a/README
+++ b/README
@@ -1432,9 +1432,6 @@ The following options need to be configured:
                CONFIG_USB_EHCI_TXFIFO_THRESH enables setting of the
                txfilltuning field in the EHCI controller on reset.
 
-               CONFIG_USB_HUB_MIN_POWER_ON_DELAY defines the minimum
-               interval for usb hub power-on delay.(minimum 100msec)
-
 - USB Device:
                Define the below if you wish to use the USB console.
                Once firmware is rebuilt from a serial console issue the

diff --git a/common/usb_hub.c b/common/usb_hub.c
index 4875a51aceaf14347a75924fb6225d6151732039..2add4b97920fefedbad4d2cd04b888d294992841 100644 (file)
--- 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      1000
-#endif
-
 #define USB_BUFSIZ     512
 
 static struct usb_hub_device hub_dev[USB_MAX_HUB];
@@ -142,7 +138,7 @@ static void usb_hub_power_on(struct usb_hub_device *hub)
         * Wait for power to become stable,
         * plus spec-defined max time for device to connect
         */
-       mdelay(pgood_delay + CONFIG_USB_HUB_MIN_POWER_ON_DELAY);
+       mdelay(pgood_delay + 1000);
 }
 
 void usb_hub_reset(void)

diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index aae05e0333039c2647fc1571ed04d38f80d61888..f6acf6920524070e340e2653daa6000d11c671e7 100644 (file)
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -104,8 +104,6 @@
 #define CONFIG_USB_DEVICE
 #define CONFIG_USB_TTY
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
-/* This delay is really for slow-to-power-on USB sticks, not the hub */
-#define CONFIG_USB_HUB_MIN_POWER_ON_DELAY 500
 
 /* commands to include */
 #include <config_cmd_default.h>

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index cd554957dd89148dbe33c2b38160bbd9714c1656..f41c96ea7fbcd789ec4cae0b83aea3d56542defa 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -192,7 +192,6 @@
 #define CONFIG_USB_ETH_CDC
 #define CONFIG_NETCONSOLE
 #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
-#define CONFIG_USB_HUB_MIN_POWER_ON_DELAY 1200
 
 /* Framebuffer and LCD */
 #define CONFIG_VIDEO