From 19f4bb4f181b3b4b37c551efaa2b090a8b39e8f8 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 24 Jul 2012 14:13:59 +0200 Subject: [PATCH] --- yaml --- r: 316354 b: refs/heads/master c: 29b608540b030d38a978c972cbe99d40efdb7267 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-i801.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 791c791fdd46..4071480ad530 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 636752bcb5177a301d0266270661581de8624828 +refs/heads/master: 29b608540b030d38a978c972cbe99d40efdb7267 diff --git a/trunk/drivers/i2c/busses/i2c-i801.c b/trunk/drivers/i2c/busses/i2c-i801.c index bcce18dfcc39..003196fffd2c 100644 --- a/trunk/drivers/i2c/busses/i2c-i801.c +++ b/trunk/drivers/i2c/busses/i2c-i801.c @@ -863,8 +863,14 @@ static int __devinit i801_probe(struct pci_dev *dev, break; } - /* IRQ processing only tested on CougarPoint PCH */ - if (dev->device == PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS) + /* IRQ processing tested on CougarPoint PCH, ICH5, ICH7-M and ICH10 */ + if (dev->device == PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS || + dev->device == PCI_DEVICE_ID_INTEL_82801EB_3 || + dev->device == PCI_DEVICE_ID_INTEL_ICH7_17 || + dev->device == PCI_DEVICE_ID_INTEL_ICH8_5 || + dev->device == PCI_DEVICE_ID_INTEL_ICH9_6 || + dev->device == PCI_DEVICE_ID_INTEL_ICH10_4 || + dev->device == PCI_DEVICE_ID_INTEL_ICH10_5) priv->features |= FEATURE_IRQ; /* Disable features on user request */ @@ -918,8 +924,6 @@ static int __devinit i801_probe(struct pci_dev *dev, dev_dbg(&dev->dev, "SMBus using interrupt SMI#\n"); /* Disable SMBus interrupt feature if SMBus using SMI# */ priv->features &= ~FEATURE_IRQ; - } else { - dev_dbg(&dev->dev, "SMBus using PCI Interrupt\n"); } /* Clear special mode bits */ @@ -937,6 +941,7 @@ static int __devinit i801_probe(struct pci_dev *dev, dev->irq, err); goto exit_release; } + dev_info(&dev->dev, "SMBus using PCI Interrupt\n"); } /* set up the sysfs linkage to our parent device */