Commit 9283812f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'for-usb-next-2012-11-28' of... 

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"
parents ffa5c41c bb1e5dd7

drivers/usb/host/ehci-pci.c

+2 −1
Original line number Diff line number Diff line
@@ -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)

drivers/usb/host/pci-quirks.c

+3 −1
Original line number Diff line number Diff line
@@ -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)