diff mbox series

[v2,RESEND,3/3] usb: typec: pci: Enable Intel USB role mux on Apollo Lake platforms

Message ID 1538408169-26903-4-git-send-email-mathias.nyman@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series xhci fixes for usb-linus | expand

Commit Message

Mathias Nyman Oct. 1, 2018, 3:36 p.m. UTC 
From: Heikki Krogerus <heikki.krogerus@linux.intel.com>

Intel Apollo Lake has the same internal USB role mux as
Intel Cherry Trail.

Cc: <stable@vger.kernel.org>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
---
 drivers/usb/host/xhci-pci.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Heikki Krogerus Oct. 1, 2018, 3:44 p.m. UTC | #1 
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@linux.intel.com>
> 
> Intel Apollo Lake has the same internal USB role mux as
> Intel Cherry Trail.
> 
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
> ---
>  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 Krogerus Oct. 1, 2018, 3:49 p.m. UTC | #2 
On Mon, Oct 01, 2018 at 06:44:51PM +0300, Heikki Krogerus wrote:
> 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.

My bad. The topic was wrong already when I send the patch to you.
Sorry :-)


Br,
diff mbox series

Patch

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