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>

1 files changed, 6 insertions, 9 deletions

diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 87e6c832311..8201165bae2 100644
--- 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;
 }