[PATCH linux-next.git] irq: irq and pci_ids patch for additional Intel Cougar Point DeviceIDs

[Seth Heasley <seth.heasley@intel.com>]

This patch adds additional LPC Controller DeviceIDs for the Intel Cougar Point PCH.

The DeviceIDs are defined and referenced as a range of values, the same way Ibex Peak was implemented.

This patch was built against the linux-next.git tree.

Signed-off-by: Seth Heasley <seth.heasley@intel.com>

--- include/linux/pci_ids.h.orig	2010-03-25 15:42:47.000000000 -0700
+++ include/linux/pci_ids.h	2010-03-25 16:00:31.000000000 -0700
@@ -2419,8 +2419,8 @@
 #define PCI_DEVICE_ID_INTEL_82845_HB	0x1a30
 #define PCI_DEVICE_ID_INTEL_IOAT	0x1a38
 #define PCI_DEVICE_ID_INTEL_CPT_SMBUS	0x1c22
-#define PCI_DEVICE_ID_INTEL_CPT_LPC1	0x1c42
-#define PCI_DEVICE_ID_INTEL_CPT_LPC2	0x1c43
+#define PCI_DEVICE_ID_INTEL_CPT_LPC_MIN	0x1c41
+#define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX	0x1c5f
 #define PCI_DEVICE_ID_INTEL_82801AA_0	0x2410
 #define PCI_DEVICE_ID_INTEL_82801AA_1	0x2411
 #define PCI_DEVICE_ID_INTEL_82801AA_3	0x2413
--- arch/x86/pci/irq.c.orig	2010-03-25 15:42:36.000000000 -0700
+++ arch/x86/pci/irq.c	2010-03-25 16:00:31.000000000 -0700
@@ -590,8 +590,6 @@
 	case PCI_DEVICE_ID_INTEL_ICH10_1:
 	case PCI_DEVICE_ID_INTEL_ICH10_2:
 	case PCI_DEVICE_ID_INTEL_ICH10_3:
-	case PCI_DEVICE_ID_INTEL_CPT_LPC1:
-	case PCI_DEVICE_ID_INTEL_CPT_LPC2:
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;
@@ -606,6 +604,13 @@
 		return 1;
 	}
 
+	if ((device >= PCI_DEVICE_ID_INTEL_CPT_LPC_MIN) && 
+		(device <= PCI_DEVICE_ID_INTEL_CPT_LPC_MAX)) {
+		r->name = "PIIX/ICH";
+		r->get = pirq_piix_get;
+		r->set = pirq_piix_set;
+		return 1;
+	}
 	return 0;
 }