diff mbox series

[07/10] usb: typec: pci: Enable Intel USB role mux on Apollo Lake platforms

Message ID 1536841443-10713-8-git-send-email-mathias.nyman@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series xhci features for usb-next | expand

Commit Message

Mathias Nyman Sept. 13, 2018, 12:24 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.

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

Greg KH Sept. 14, 2018, 1:27 p.m. UTC | #1 
On Thu, Sep 13, 2018 at 03:24:00PM +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.
> 
> 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(-)

Why is this not a 4.19-final patch?  Stable?
Mathias Nyman Sept. 17, 2018, 7:47 a.m. UTC | #2 
On 14.09.2018 16:27, Greg KH wrote:
> On Thu, Sep 13, 2018 at 03:24:00PM +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.
>>
>> 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(-)
> 
> Why is this not a 4.19-final patch?  Stable?
> 

This wasn't urgent in any way according to Heikki, so
I queued it for linux-next. But both are fine.

But Stable would make sense.

-Mathias
diff mbox series

Patch

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 6372edf..aef66ad 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_APL_XHCI ||