PCI/lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs
authorSeth Heasley <seth.heasley@intel.com>
Mon, 10 Jan 2011 21:08:37 +0000 (13:08 -0800)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Tue, 8 Feb 2011 21:08:05 +0000 (13:08 -0800)
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>
arch/x86/pci/irq.c
include/linux/pci_ids.h

index 87e6c83231172f8bc70bb389b03f498dd0b28c7a..8201165bae28c7c8023fd29f130686c9e68a2ded 100644 (file)
@@ -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;
 }
 
index 3adb06ebf8418aa0a886e474a9e3460ddb4cbe09..46f23999458d0a497d0bed63ff4f8f12ac508312 100644 (file)
 #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