| From bb1e5dd7113d2fd178d3af9aca8f480ae0468edf Mon Sep 17 00:00:00 2001 |
| From: Russell Webb <russell.webb@linux.intel.com> |
| Date: Fri, 9 Nov 2012 13:58:49 -0800 |
| Subject: xhci: Add Lynx Point LP to list of Intel switchable hosts |
| |
| From: Russell Webb <russell.webb@linux.intel.com> |
| |
| commit bb1e5dd7113d2fd178d3af9aca8f480ae0468edf upstream. |
| |
| Like Lynx Point, Lynx Point LP is also switchable. See |
| 1c12443ab8eba71a658fae4572147e56d1f84f66 for more details. |
| |
| This patch should be backported to stable kernels as old as 3.0, |
| that contain commit 69e848c2090aebba5698a1620604c7dccb448684 |
| "Intel xhci: Support EHCI/xHCI port switching." |
| |
| Signed-off-by: Russell Webb <russell.webb@linux.intel.com> |
| Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/host/ehci-pci.c | 3 ++- |
| drivers/usb/host/pci-quirks.c | 4 +++- |
| 2 files changed, 5 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/usb/host/ehci-pci.c |
| +++ b/drivers/usb/host/ehci-pci.c |
| @@ -334,7 +334,8 @@ static bool usb_is_intel_switchable_ehci |
| pdev->vendor == PCI_VENDOR_ID_INTEL && |
| (pdev->device == 0x1E26 || |
| pdev->device == 0x8C2D || |
| - pdev->device == 0x8C26); |
| + pdev->device == 0x8C26 || |
| + pdev->device == 0x9C26); |
| } |
| |
| static void ehci_enable_xhci_companion(void) |
| --- a/drivers/usb/host/pci-quirks.c |
| +++ b/drivers/usb/host/pci-quirks.c |
| @@ -723,6 +723,7 @@ static int handshake(void __iomem *ptr, |
| } |
| |
| #define PCI_DEVICE_ID_INTEL_LYNX_POINT_XHCI 0x8C31 |
| +#define PCI_DEVICE_ID_INTEL_LYNX_POINT_LP_XHCI 0x9C31 |
| |
| bool usb_is_intel_ppt_switchable_xhci(struct pci_dev *pdev) |
| { |
| @@ -736,7 +737,8 @@ bool usb_is_intel_lpt_switchable_xhci(st |
| { |
| return pdev->class == PCI_CLASS_SERIAL_USB_XHCI && |
| pdev->vendor == PCI_VENDOR_ID_INTEL && |
| - pdev->device == PCI_DEVICE_ID_INTEL_LYNX_POINT_XHCI; |
| + (pdev->device == PCI_DEVICE_ID_INTEL_LYNX_POINT_XHCI || |
| + pdev->device == PCI_DEVICE_ID_INTEL_LYNX_POINT_LP_XHCI); |
| } |
| |
| bool usb_is_intel_switchable_xhci(struct pci_dev *pdev) |