Commit 29b60854 authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare

i2c-i801: Enable interrupts on ICH5/7/8/9/10

Enable interrupts on more devices. ICH5, ICH7(-M) and ICH10 have been
tested to work OK. ICH8 and ICH9 are expected to work just fine as
they are very close to ICH7 and ICH10.

Ultimately we want to enable this feature on at least every device
since the ICH5, but for now we limit the exposure. We'll enable it for
other devices if we don't get negative feedback.

As a bonus, let the user know when interrupts are used.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: Daniel Kurtz <djkurtz@chromium.org>
parent 636752bc
...@@ -863,8 +863,14 @@ static int __devinit i801_probe(struct pci_dev *dev, ...@@ -863,8 +863,14 @@ static int __devinit i801_probe(struct pci_dev *dev,
break; break;
} }
/* IRQ processing only tested on CougarPoint PCH */ /* IRQ processing tested on CougarPoint PCH, ICH5, ICH7-M and ICH10 */
if (dev->device == PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS) 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; priv->features |= FEATURE_IRQ;
/* Disable features on user request */ /* Disable features on user request */
...@@ -918,8 +924,6 @@ static int __devinit i801_probe(struct pci_dev *dev, ...@@ -918,8 +924,6 @@ static int __devinit i801_probe(struct pci_dev *dev,
dev_dbg(&dev->dev, "SMBus using interrupt SMI#\n"); dev_dbg(&dev->dev, "SMBus using interrupt SMI#\n");
/* Disable SMBus interrupt feature if SMBus using SMI# */ /* Disable SMBus interrupt feature if SMBus using SMI# */
priv->features &= ~FEATURE_IRQ; priv->features &= ~FEATURE_IRQ;
} else {
dev_dbg(&dev->dev, "SMBus using PCI Interrupt\n");
} }
/* Clear special mode bits */ /* Clear special mode bits */
...@@ -937,6 +941,7 @@ static int __devinit i801_probe(struct pci_dev *dev, ...@@ -937,6 +941,7 @@ static int __devinit i801_probe(struct pci_dev *dev,
dev->irq, err); dev->irq, err);
goto exit_release; goto exit_release;
} }
dev_info(&dev->dev, "SMBus using PCI Interrupt\n");
} }
/* set up the sysfs linkage to our parent device */ /* set up the sysfs linkage to our parent device */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment