Add some Intel PCI device ID's to irq.c; sync irq-xen.c with irq.c

From: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/arch/i386/pci/irq-xen.c b/arch/i386/pci/irq-xen.c
index 94fdd4c8bf639dd16a0fa0a148e25b976142484b..a4a5269108366618c1d5d57c6eeb0b6f2be5f446 100644 (file)
--- a/arch/i386/pci/irq-xen.c
+++ b/arch/i386/pci/irq-xen.c
@@ -553,15 +553,34 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route
                case PCI_DEVICE_ID_INTEL_ICH9_3:
                case PCI_DEVICE_ID_INTEL_ICH9_4:
                case PCI_DEVICE_ID_INTEL_ICH9_5:
+               case PCI_DEVICE_ID_INTEL_TOLAPAI_0:
                case PCI_DEVICE_ID_INTEL_ICH10_0:
                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_PATSBURG_LPC_0:
+               case PCI_DEVICE_ID_INTEL_PATSBURG_LPC_1:
                        r->name = "PIIX/ICH";
                        r->get = pirq_piix_get;
                        r->set = pirq_piix_set;
                        return 1;
        }
+
+       if ((device >= PCI_DEVICE_ID_INTEL_PCH_LPC_MIN) && 
+               (device <= PCI_DEVICE_ID_INTEL_PCH_LPC_MAX)) {
+               r->name = "PIIX/ICH";
+               r->get = pirq_piix_get;
+               r->set = pirq_piix_set;
+               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;
 }
 

diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c
index 486004a1e94743ac8e645e77d59a64cf1e6c16e6..158a2e25cbd649cf24a3f6dfa2ed0fc9bf9b138b 100644 (file)
--- a/arch/i386/pci/irq.c
+++ b/arch/i386/pci/irq.c
@@ -549,10 +549,13 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route
                case PCI_DEVICE_ID_INTEL_ICH9_3:
                case PCI_DEVICE_ID_INTEL_ICH9_4:
                case PCI_DEVICE_ID_INTEL_ICH9_5:
+               case PCI_DEVICE_ID_INTEL_TOLAPAI_0:
                case PCI_DEVICE_ID_INTEL_ICH10_0:
                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_PATSBURG_LPC_0:
+               case PCI_DEVICE_ID_INTEL_PATSBURG_LPC_1:
                        r->name = "PIIX/ICH";
                        r->get = pirq_piix_get;
                        r->set = pirq_piix_set;
@@ -567,6 +570,13 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route
                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;
 }
 

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index fb654ec723645cccbf98c620c5f7daa9e9650bae..3df17fee4d02606b90a9d04f8915cc012d3814bf 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2098,6 +2098,10 @@
 #define PCI_DEVICE_ID_INTEL_82840_HB   0x1a21
 #define PCI_DEVICE_ID_INTEL_82845_HB   0x1a30
 #define PCI_DEVICE_ID_INTEL_IOAT       0x1a38
+#define PCI_DEVICE_ID_INTEL_CPT_LPC_MIN        0x1c41
+#define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX        0x1c5f
+#define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_0     0x1d40
+#define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_1     0x1d41
 #define PCI_DEVICE_ID_INTEL_82801AA_0  0x2410
 #define PCI_DEVICE_ID_INTEL_82801AA_1  0x2411
 #define PCI_DEVICE_ID_INTEL_82801AA_3  0x2413
@@ -2222,6 +2226,7 @@
 #define PCI_DEVICE_ID_INTEL_PCH_LPC_MIN        0x3b00
 #define PCI_DEVICE_ID_INTEL_PCH_LPC_MAX        0x3b1f
 #define PCI_DEVICE_ID_INTEL_PCH_SMBUS  0x3b30
+#define PCI_DEVICE_ID_INTEL_TOLAPAI_0  0x5031
 #define PCI_DEVICE_ID_INTEL_TOLAPAI_1  0x5032
 #define PCI_DEVICE_ID_INTEL_82371SB_0  0x7000
 #define PCI_DEVICE_ID_INTEL_82371SB_1  0x7010