iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: EHCI: OMAP: Finish ehci omap phy reset cycle before adding hcd.

Browse Source 
'ARM: OMAP3: USB: Fix the EHCI ULPI PHY reset issue' (1fcb57d0f) created a regression
with Beagleboard xM if booting the kernel after running 'usb start' under u-boot.

Finishing the reset before calling 'usb_add_hcd' fixes the regression. This is most likely due to
usb_add_hcd calling the driver's reset and init functions which expect the hardware to be
up and running.

Signed-off-by: Russ Dill <Russ.Dill@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Cc: stable <stable@vger.kernel.org> [3.4]
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Russ Dill 2012-05-04 04:24:47 -07:00 committed by Greg Kroah-Hartman
parent 3cccc29252
commit 3aa2ae74ba
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/usb/host/ehci-omap.c
View File

@ -242,15 +242,6 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
ehci_reset(omap_ehci); ehci_reset(omap_ehci);
ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (ret) {
dev_err(dev, "failed to add hcd with err %d\n", ret);
goto err_add_hcd;
}
/* root ports should always stay powered */
ehci_port_power(omap_ehci, 1);
if (pdata->phy_reset) { if (pdata->phy_reset) {
/* Hold the PHY in RESET for enough time till /* Hold the PHY in RESET for enough time till
* PHY is settled and ready * PHY is settled and ready
@ -264,6 +255,15 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
gpio_set_value(pdata->reset_gpio_port[1], 1); gpio_set_value(pdata->reset_gpio_port[1], 1);
} }
ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (ret) {
dev_err(dev, "failed to add hcd with err %d\n", ret);
goto err_add_hcd;
}
/* root ports should always stay powered */
ehci_port_power(omap_ehci, 1);
return 0; return 0;
err_add_hcd: err_add_hcd: