V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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>
This commit is contained in:
Stephen Warren 2014-05-19 14:21:18 -06:00 committed by Marek Vasut
parent 0d437bcaf9
commit 77b83e6d09
4 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README
View File

@ -1432,9 +1432,6 @@ The following options need to be configured:
CONFIG_USB_EHCI_TXFIFO_THRESH enables setting of the CONFIG_USB_EHCI_TXFIFO_THRESH enables setting of the
txfilltuning field in the EHCI controller on reset. 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: - USB Device:
Define the below if you wish to use the USB console. Define the below if you wish to use the USB console.
Once firmware is rebuilt from a serial console issue the Once firmware is rebuilt from a serial console issue the

6
common/usb_hub.c
View File

@ -35,10 +35,6 @@
#include <asm/4xx_pci.h> #include <asm/4xx_pci.h>
#endif #endif
#ifndef CONFIG_USB_HUB_MIN_POWER_ON_DELAY
#define CONFIG_USB_HUB_MIN_POWER_ON_DELAY 1000
#endif
#define USB_BUFSIZ 512 #define USB_BUFSIZ 512
static struct usb_hub_device hub_dev[USB_MAX_HUB]; 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, * Wait for power to become stable,
* plus spec-defined max time for device to connect * 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) void usb_hub_reset(void)

2
include/configs/cm_t35.h
View File

@ -104,8 +104,6 @@
#define CONFIG_USB_DEVICE #define CONFIG_USB_DEVICE
#define CONFIG_USB_TTY #define CONFIG_USB_TTY
#define CONFIG_SYS_CONSOLE_IS_IN_ENV #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 */ /* commands to include */
#include <config_cmd_default.h> #include <config_cmd_default.h>

1
include/configs/gw_ventana.h
View File

@ -192,7 +192,6 @@
#define CONFIG_USB_ETH_CDC #define CONFIG_USB_ETH_CDC
#define CONFIG_NETCONSOLE #define CONFIG_NETCONSOLE
#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
#define CONFIG_USB_HUB_MIN_POWER_ON_DELAY 1200
/* Framebuffer and LCD */ /* Framebuffer and LCD */
#define CONFIG_VIDEO #define CONFIG_VIDEO