summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkhali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0>2008-10-24 08:24:12 +0000
committerkhali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0>2008-10-24 08:24:12 +0000
commit2e32fa769d30a3d30b0f27d04d6682b031cfec2e (patch)
tree205b2131a8f6fda386e12c177084ae5dbaf5ceea
parent825f3fb1bff0c9cca493ab428126cdee1ece7e48 (diff)
downloadlm-sensors-2e32fa769d30a3d30b0f27d04d6682b031cfec2e.tar.gz
Add SMBus support for Intel PCH (Ibex Peak). Backport from Linux 2.6.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5375 7894878c-1315-0410-8ee3-d5d059ff63e0
-rw-r--r--CHANGES1
-rw-r--r--README2
-rw-r--r--doc/busses/i2c-i8015
-rw-r--r--kernel/busses/i2c-i801.c14
4 files changed, 18 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 0d7e637f..63120370 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,7 @@ SVN-HEAD
max6646, max6647 and max6649
Module i2c-i801: Remove verbose debugging messages (2.6 backport)
Properly report bus arbitration lost (2.6 backport)
+ Add support for PCH (Ibex Peak) (2.6 backport)
Module i2c-piix4: Minor cleanups (2.6 backport)
Module i2c-viapro: Add VX800/VX820 support (2.6 backport)
Module lm78: Prevent misdetection of Winbond chips
diff --git a/README b/README
index c3bccb43..47bf6065 100644
--- a/README
+++ b/README
@@ -51,7 +51,7 @@ At least the following I2C/SMBus adapters are supported:
DEC 21272/21274 (Tsunami/Typhoon - on Alpha boards)
Intel ICH/ICH0/ICH2/ICH3/ICH4/ICH5/ICH6/ICH7/ICH8/ICH9 (82801xx)
Intel 6300ESB, 631xESB/632xESB (ESB2)
- Intel Tolapai, ICH10
+ Intel Tolapai, ICH10, PCH
Intel PIIX4 (used in many Intel chipsets)
Intel I810/I810E/I815/I845G GMCH
Intel 82443MX (440MX)
diff --git a/doc/busses/i2c-i801 b/doc/busses/i2c-i801
index 831dd816..3d96016a 100644
--- a/doc/busses/i2c-i801
+++ b/doc/busses/i2c-i801
@@ -15,8 +15,9 @@ Supported adapters:
* Intel 6300ESB/ESB2
* Intel 82801FB/FR/FW/FRW (ICH6)
* Intel ICH7/ICH8/ICH9
- * Intel Tolapai
- * Intel ICH10
+ * Intel EP80579 (Tolapai)
+ * Intel 82801JI (ICH10)
+ * Intel PCH
Datasheets: Publicly available at the Intel website
Authors: Frodo Looijaard <frodol@dds.nl>, Philip Edelbrock
diff --git a/kernel/busses/i2c-i801.c b/kernel/busses/i2c-i801.c
index 21918ba1..f24efcaf 100644
--- a/kernel/busses/i2c-i801.c
+++ b/kernel/busses/i2c-i801.c
@@ -37,6 +37,7 @@
Tolapai 5032 ("")
ICH10 3A30 ("")
ICH10 3A60 ("")
+ PCH 3B30 ("")
This driver supports several versions of Intel's I/O Controller Hubs (ICH).
For SMBus support, they are similar to the PIIX4 and are part
@@ -119,6 +120,10 @@
#define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a60
#endif
+#ifndef PCI_DEVICE_ID_INTEL_PCH_SMBUS
+#ifdef PCI_DEVICE_ID_INTEL_PCH_SMBUS 0x3b30
+#endif
+
#ifdef I2C_CLIENT_PEC
#define HAVE_PEC
#endif
@@ -192,7 +197,8 @@ static int __devinit i801_setup(struct pci_dev *dev)
dev->device == PCI_DEVICE_ID_INTEL_ICH9_6 ||
dev->device == PCI_DEVICE_ID_INTEL_TOLAPAI_1 ||
dev->device == PCI_DEVICE_ID_INTEL_ICH10_4 ||
- dev->device == PCI_DEVICE_ID_INTEL_ICH10_5)
+ dev->device == PCI_DEVICE_ID_INTEL_ICH10_5 ||
+ dev->device == PCI_DEVICE_ID_INTEL_PCH_SMBUS)
isich4 = 1;
else
isich4 = 0;
@@ -682,6 +688,12 @@ static struct pci_device_id i801_ids[] __devinitdata = {
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
},
+ {
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_PCH_SMBUS,
+ .subvendor = PCI_ANY_ID,
+ .subdevice = PCI_ANY_ID,
+ },
{ 0, }
};