On Thu, May 07, 2015 at 01:52:34PM -0500, Felipe Balbi wrote: > On Thu, May 07, 2015 at 09:19:29AM +0300, Heikki Krogerus wrote: > > On some BYT platforms the USB2 PHY needs to be put into > > operational mode by the controller driver with GPIOs > > controlling the PHYs reset and cs signals. > > > > Signed-off-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx> > > --- > > drivers/usb/dwc3/dwc3-pci.c | 36 ++++++++++++++++++++++++++++++++++++ > > 1 file changed, 36 insertions(+) > > > > diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c > > index b773fb5..0235f46 100644 > > --- a/drivers/usb/dwc3/dwc3-pci.c > > +++ b/drivers/usb/dwc3/dwc3-pci.c > > @@ -21,6 +21,8 @@ > > #include <linux/slab.h> > > #include <linux/pci.h> > > #include <linux/platform_device.h> > > +#include <linux/gpio/consumer.h> > > +#include <linux/acpi.h> > > > > #include "platform_data.h" > > > > @@ -31,6 +33,15 @@ > > #define PCI_DEVICE_ID_INTEL_SPTLP 0x9d30 > > #define PCI_DEVICE_ID_INTEL_SPTH 0xa130 > > > > +static const struct acpi_gpio_params reset_gpios = { 0, 0, false }; > > +static const struct acpi_gpio_params cs_gpios = { 1, 0, false }; > > + > > +static const struct acpi_gpio_mapping acpi_dwc3_byt_gpios[] = { > > + { "reset-gpios", &reset_gpios, 1 }, > > + { "cs-gpios", &cs_gpios, 1 }, > > + { }, > > +}; > > + > > static int dwc3_pci_quirks(struct pci_dev *pdev) > > { > > if (pdev->vendor == PCI_VENDOR_ID_AMD && > > @@ -65,6 +76,30 @@ static int dwc3_pci_quirks(struct pci_dev *pdev) > > sizeof(pdata)); > > } > > > > + if (pdev->vendor == PCI_VENDOR_ID_INTEL && > > + pdev->device == PCI_DEVICE_ID_INTEL_BYT) { > > + struct gpio_desc *gpio; > > + > > + acpi_dev_add_driver_gpios(ACPI_COMPANION(&pdev->dev), > > + acpi_dwc3_byt_gpios); > > + > > + /* These GPIOs will turn on the USB2 PHY */ > > + gpio = gpiod_get(&pdev->dev, "cs"); > > + if (!IS_ERR(gpio)) { > > + gpiod_direction_output(gpio, 0); > > + gpiod_set_value_cansleep(gpio, 1); > > + gpiod_put(gpio); > > + } > > + > > + gpio = gpiod_get(&pdev->dev, "reset"); > > + if (!IS_ERR(gpio)) { > > + gpiod_direction_output(gpio, 0); > > + gpiod_set_value_cansleep(gpio, 1); > > + gpiod_put(gpio); > > + msleep(10); > > WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt > #76: FILE: drivers/usb/dwc3/dwc3-pci.c:99: > + msleep(10); > > looks like usleep_range() is more desirable here. if this is the only problem, I'll fix while applying. -- balbi
Attachment:
signature.asc
Description: Digital signature