Commit 3004cfd6 authored by Stephan Gerhold's avatar Stephan Gerhold Committed by Felipe Balbi

Revert "usb: dwc3: pci: Use devm functions to get the phy GPIOs"

Commit 211f658b ("usb: dwc3: pci: Use devm functions to get
the phy GPIOs") changed the code to claim the PHY GPIOs permanently
for Intel Baytrail devices.

This causes issues when the actual PHY driver attempts to claim the
same GPIO descriptors. For example, tusb1210 now fails to probe with:

  tusb1210: probe of dwc3.0.auto.ulpi failed with error -16 (EBUSY)

dwc3-pci needs to turn on the PHY once before dwc3 is loaded, but
usually the PHY driver will then hold the GPIOs to turn off the
PHY when requested (e.g. during suspend).

To fix the problem, this reverts the commit to restore the old
behavior to put the GPIOs immediately after usage.

Link: https://www.spinics.net/lists/linux-usb/msg174681.html
Cc: stable@vger.kernel.org
Signed-off-by: default avatarStephan Gerhold <stephan@gerhold.net>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent d9d1dc81
...@@ -170,20 +170,20 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc) ...@@ -170,20 +170,20 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc)
* put the gpio descriptors again here because the phy driver * put the gpio descriptors again here because the phy driver
* might want to grab them, too. * might want to grab them, too.
*/ */
gpio = devm_gpiod_get_optional(&pdev->dev, "cs", gpio = gpiod_get_optional(&pdev->dev, "cs", GPIOD_OUT_LOW);
GPIOD_OUT_LOW);
if (IS_ERR(gpio)) if (IS_ERR(gpio))
return PTR_ERR(gpio); return PTR_ERR(gpio);
gpiod_set_value_cansleep(gpio, 1); gpiod_set_value_cansleep(gpio, 1);
gpiod_put(gpio);
gpio = devm_gpiod_get_optional(&pdev->dev, "reset", gpio = gpiod_get_optional(&pdev->dev, "reset", GPIOD_OUT_LOW);
GPIOD_OUT_LOW);
if (IS_ERR(gpio)) if (IS_ERR(gpio))
return PTR_ERR(gpio); return PTR_ERR(gpio);
if (gpio) { if (gpio) {
gpiod_set_value_cansleep(gpio, 1); gpiod_set_value_cansleep(gpio, 1);
gpiod_put(gpio);
usleep_range(10000, 11000); usleep_range(10000, 11000);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment