diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-28 09:44:38 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-28 09:44:38 -0800 |
| commit | c17398a9fe29f6759c97b57ea50713ea50f61efb (patch) | |
| tree | 91df7d01cd2d6dc274cf2ea1bf7ddb17b173543d | |
| parent | 81178581cf2a7491a998572b2bae72a0bf4ff5b6 (diff) | |
| download | patches-c17398a9fe29f6759c97b57ea50713ea50f61efb.tar.gz | |
updated usb/usb-fix-occasional-ulpi-timeouts-with-ehci-mxc.patch
| -rw-r--r-- | usb/usb-fix-occasional-ulpi-timeouts-with-ehci-mxc.patch | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/usb/usb-fix-occasional-ulpi-timeouts-with-ehci-mxc.patch b/usb/usb-fix-occasional-ulpi-timeouts-with-ehci-mxc.patch index aebee9a86bf0c2..2a04ea7ca26556 100644 --- a/usb/usb-fix-occasional-ulpi-timeouts-with-ehci-mxc.patch +++ b/usb/usb-fix-occasional-ulpi-timeouts-with-ehci-mxc.patch @@ -1,10 +1,10 @@ -From valentin.longchamp@epfl.ch Tue Dec 22 11:28:19 2009 +From valentin.longchamp@epfl.ch Thu Jan 28 09:43:45 2010 From: Valentin Longchamp <valentin.longchamp@epfl.ch> -Date: Wed, 2 Dec 2009 17:13:01 +0100 +Date: Wed, 20 Jan 2010 19:43:23 +0100 Subject: USB: fix occasional ULPI timeouts with ehci-mxc -To: daniel@caiaq.de -Cc: acassis@gmail.com, linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org, Valentin Longchamp <valentin.longchamp@epfl.ch> -Message-ID: <1259770381-16987-1-git-send-email-valentin.longchamp@epfl.ch> +To: gregkh@suse.de +Cc: linux-usb@vger.kernel.org, Valentin Longchamp <valentin.longchamp@epfl.ch> +Message-ID: <1264013003-10903-1-git-send-email-valentin.longchamp@epfl.ch> On various mxc boards, the intial ULPI reads resulted in a timeout @@ -16,16 +16,15 @@ pdata->init call) before actually enabling clocks and configuring registers in the devices fixes this problem. Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> -Acked-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/usb/host/ehci-mxc.c | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) + drivers/usb/host/ehci-mxc.c | 23 +++++++++++------------ + 1 file changed, 11 insertions(+), 12 deletions(-) --- a/drivers/usb/host/ehci-mxc.c +++ b/drivers/usb/host/ehci-mxc.c -@@ -162,6 +162,15 @@ static int ehci_mxc_drv_probe(struct pla +@@ -162,6 +162,17 @@ static int ehci_mxc_drv_probe(struct pla goto err_ioremap; } @@ -36,12 +35,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + dev_err(dev, "platform init failed\n"); + goto err_init; + } ++ /* platforms need some time to settle changed IO settings */ ++ mdelay(10); + } + /* enable clocks */ priv->usbclk = clk_get(dev, "usb"); if (IS_ERR(priv->usbclk)) { -@@ -192,15 +201,6 @@ static int ehci_mxc_drv_probe(struct pla +@@ -192,18 +203,6 @@ static int ehci_mxc_drv_probe(struct pla if (ret < 0) goto err_init; @@ -54,6 +55,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - } - } - - /* most platforms need some time to settle changed IO settings */ - mdelay(10); - +- /* most platforms need some time to settle changed IO settings */ +- mdelay(10); +- + /* Initialize the transceiver */ + if (pdata->otg) { + pdata->otg->io_priv = hcd->regs + ULPI_VIEWPORT_OFFSET; |