Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3aa2ae74 authored by Russ Dill's avatar Russ Dill Committed by Greg Kroah-Hartman
Browse files

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



'ARM: OMAP3: USB: Fix the EHCI ULPI PHY reset issue' (1fcb57d0) 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: default avatarRuss Dill <Russ.Dill@ti.com>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Cc: stable <stable@vger.kernel.org> [3.4]
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3cccc292

drivers/usb/host/ehci-omap.c

+9 −9
Original line number Diff line number Diff line
@@ -242,15 +242,6 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) 


	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) {

		/* Hold the PHY in RESET for enough time till

		 * 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);

	}



	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;



err_add_hcd: