diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 13:25:49 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 13:25:49 -0800 |
| commit | 9283812fd591f6201c423d942106ddf1a0bd8ee8 (patch) | |
| tree | b05cb157faf76db194a4e830a69319902986871b | |
| parent | ffa5c41c81503b6f48fddb5d39f18af526ded8d3 (diff) | |
| parent | bb1e5dd7113d2fd178d3af9aca8f480ae0468edf (diff) | |
Merge tag 'for-usb-next-2012-11-28' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-next
From Sarah:
"xhci: Intel Lynx Point LP support.
Hi Greg,
Here's a patch to add the new Intel Lynx Point LP chipset to the list of Intel
xHCI hosts that need the EHCI to xHCI port switchover.
Please queue for 3.8.
Sarah Sharp"
| -rw-r--r-- | drivers/usb/host/ehci-pci.c | 3 | ||||
| -rw-r--r-- | drivers/usb/host/pci-quirks.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 3fb76ca61848..dabb20494826 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -330,7 +330,8 @@ static bool usb_is_intel_switchable_ehci(struct pci_dev *pdev) 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) diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c index 15cfb06769e6..a3b6d7104ae2 100644 --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c @@ -723,6 +723,7 @@ static int handshake(void __iomem *ptr, u32 mask, u32 done, } #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(struct pci_dev *pdev) { 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) |