Hi, Not a biggie, but why was the topic for this patch changed? I'm not sure Apollo lakes even have Type-C connectors. The mux is needed with the uAB connectors. On Mon, Oct 01, 2018 at 06:36:09PM +0300, Mathias Nyman wrote: > From: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx> > > Intel Apollo Lake has the same internal USB role mux as > Intel Cherry Trail. > > Cc: <stable@xxxxxxxxxxxxxxx> > Signed-off-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx> > Signed-off-by: Mathias Nyman <mathias.nyman@xxxxxxxxxxxxxxx> > --- > drivers/usb/host/xhci-pci.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c > index 722860e..51dd8e0 100644 > --- a/drivers/usb/host/xhci-pci.c > +++ b/drivers/usb/host/xhci-pci.c > @@ -179,10 +179,12 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) > xhci->quirks |= XHCI_PME_STUCK_QUIRK; > } > if (pdev->vendor == PCI_VENDOR_ID_INTEL && > - pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI) { > + pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI) > xhci->quirks |= XHCI_SSIC_PORT_UNUSED; > + if (pdev->vendor == PCI_VENDOR_ID_INTEL && > + (pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI || > + pdev->device == PCI_DEVICE_ID_INTEL_APL_XHCI)) > xhci->quirks |= XHCI_INTEL_USB_ROLE_SW; > - } > if (pdev->vendor == PCI_VENDOR_ID_INTEL && > (pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI || > pdev->device == PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_XHCI || > -- > 2.7.4 -- heikki