thunderbolt: Add support for INTEL_FALCON_RIDGE_2C controller.

From: Xavier Gnata <xavier.gnata@gmail.com>

Add support to INTEL_FALCON_RIDGE_2C controller and corresponding quirk
to support suspend/resume.
Tested against 4.7 master on a MacBook Air 11" 2015.

Signed-off-by: Andreas Noever <andreas.noever@gmail.com>
Reviewed-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 10 insertions, 0 deletions

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 6ff6469dab2a..44e0ff37480b 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -3327,6 +3327,7 @@ static void quirk_apple_wait_for_thunderbolt(struct pci_dev *dev)
         if (nhi->vendor != PCI_VENDOR_ID_INTEL
                     || (nhi->device != PCI_DEVICE_ID_INTEL_LIGHT_RIDGE &&
                         nhi->device != PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C &&
+                        nhi->device != PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_NHI &&
                         nhi->device != PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_NHI)
                     || nhi->class != PCI_CLASS_SYSTEM_OTHER << 8)
                 goto out;
@@ -3343,6 +3344,9 @@ DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,
                                PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C,
                                quirk_apple_wait_for_thunderbolt);
 DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,
+                               PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_BRIDGE,
+                               quirk_apple_wait_for_thunderbolt);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,
                                PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_BRIDGE,
                                quirk_apple_wait_for_thunderbolt);
 #endif
diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
index 9c15344b657a..a8c20413dbda 100644
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@ -651,6 +651,12 @@ static struct pci_device_id nhi_ids[] = {
         {
                 .class = PCI_CLASS_SYSTEM_OTHER << 8, .class_mask = ~0,
                 .vendor = PCI_VENDOR_ID_INTEL,
+                .device = PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_NHI,
+                .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID,
+        },
+        {
+                .class = PCI_CLASS_SYSTEM_OTHER << 8, .class_mask = ~0,
+                .vendor = PCI_VENDOR_ID_INTEL,
                 .device = PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_NHI,
                 .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID,
         },