aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorSeth Heasley <seth.heasley@intel.com>2011-01-10 13:08:37 -0800
committerJesse Barnes <jbarnes@virtuousgeek.org>2011-02-08 13:08:05 -0800
commitc13ff2ff3ad1479f222e18f9caba3db5af68d549 (patch)
treec4b9c9f057db3c2564dbcece9d98d27ebab48d00 /arch/x86/pci
parent0f12a4e29368a9476076515881d9ef4e5876c6e2 (diff)
downloadkernel_samsung_smdk4412-c13ff2ff3ad1479f222e18f9caba3db5af68d549.zip
kernel_samsung_smdk4412-c13ff2ff3ad1479f222e18f9caba3db5af68d549.tar.gz
kernel_samsung_smdk4412-c13ff2ff3ad1479f222e18f9caba3db5af68d549.tar.bz2
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>
Diffstat (limited to 'arch/x86/pci')
-rw-r--r--arch/x86/pci/irq.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 87e6c83..8201165 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;
}