diff options
| author | Colin Ian King <colin.king@canonical.com> | 2012-07-30 11:06:42 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-09 11:27:53 -0400 |
| commit | aeaab8a0fee896fb31f2e5044f86d2a270d65cb6 (patch) | |
| tree | 01890e9022328ce619e04d098c1275662789a49b | |
| parent | 4e98953723643ac9db9191381f52973a8f113902 (diff) | |
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>
| -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) | |||
| 450 | writel(FLAG_CF, &ehci_regs->configured_flag); | 450 | writel(FLAG_CF, &ehci_regs->configured_flag); |
| 451 | 451 | ||
| 452 | /* Wait until the controller is no longer halted */ | 452 | /* Wait until the controller is no longer halted */ |
| 453 | loop = 10; | 453 | loop = 1000; |
| 454 | do { | 454 | do { |
| 455 | status = readl(&ehci_regs->status); | 455 | status = readl(&ehci_regs->status); |
| 456 | if (!(status & STS_HALT)) | 456 | if (!(status & STS_HALT)) |