diff options
| author | Colin Ian King <colin.king@canonical.com> | 2012-07-30 16:06:42 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-09 08:31:51 -0700 |
| commit | 6091e5bc36cc2d74b2c5ab1ae2dcf32cf82e242f (patch) | |
| tree | 2dbb4859ee1d9ef896fccbe6117e07f30b1aaf23 /drivers | |
| parent | 143d9963df6580491f9a5c38c9d4883786f78123 (diff) | |
| download | linux-3.10-6091e5bc36cc2d74b2c5ab1ae2dcf32cf82e242f.tar.gz linux-3.10-6091e5bc36cc2d74b2c5ab1ae2dcf32cf82e242f.tar.bz2 linux-3.10-6091e5bc36cc2d74b2c5ab1ae2dcf32cf82e242f.zip | |
USB: echi-dbgp: increase the controller wait time to come out of halt.
commit f96a4216e85050c0a9d41a41ecb0ae9d8e39b509 upstream.
The default 10 microsecond delay for the controller to come out of
halt in dbgp_ehci_startup is too short, so increase it to 1 millisecond.
This is based on emperical testing on various USB debug ports on
modern machines such as a Lenovo X220i and an Ivybridge development
platform that needed to wait ~450-950 microseconds.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/early/ehci-dbgp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c index 1fc8f124980..347bb058e1e 100644 --- a/drivers/usb/early/ehci-dbgp.c +++ b/drivers/usb/early/ehci-dbgp.c @@ -450,7 +450,7 @@ static int dbgp_ehci_startup(void) writel(FLAG_CF, &ehci_regs->configured_flag); /* Wait until the controller is no longer halted */ - loop = 10; + loop = 1000; do { status = readl(&ehci_regs->status); if (!(status & STS_HALT)) |