PCI/lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs

This patch adds the LPC Controller DeviceIDs for the Intel DH89xxCC PCH.

The code for capturing ranges of LPC Controller DeviceIDs has also been updated.

Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Seth Heasley <seth.heasley@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 87e6c83..8201165 100644 (file)
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -597,21 +597,18 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route
                return 1;
        }
 
-       if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN) && 
-               (device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX)) {
+       if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN && 
+            device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX) 
+       ||  (device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN && 
+            device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)
+       ||  (device >= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN &&
+            device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)) {
                r->name = "PIIX/ICH";
                r->get = pirq_piix_get;
                r->set = pirq_piix_set;
                return 1;
        }
 
-       if ((device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN) && 
-               (device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)) {
-               r->name = "PIIX/ICH";
-               r->get = pirq_piix_get;
-               r->set = pirq_piix_set;
-               return 1;
-       }
        return 0;
 }
 

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 3adb06e..46f2399 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2480,6 +2480,9 @@
 #define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS     0x1d22
 #define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_0     0x1d40
 #define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_1     0x1d41
+#define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN   0x2310
+#define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX   0x231f
+#define PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS     0x2330
 #define PCI_DEVICE_ID_INTEL_82801AA_0  0x2410
 #define PCI_DEVICE_ID_INTEL_82801AA_1  0x2411
 #define PCI_DEVICE_ID_INTEL_82801AA_3  0x2413