Changeset 5231

Timestamp:

05/02/08 14:48:17 (5 years ago)

Author:

khali

Message:

Add Intel ICH10 support.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• README (modified) (1 diff)
• doc/busses/i2c-i801 (modified) (1 diff)
• kernel/busses/i2c-i801.c (modified) (4 diffs)

lm-sensors/trunk/CHANGES

@@ -7 +7 @@
   Module i2c-amd756-s4882: Fix an error path (2.6 backport)
   Module i2c-i801: Drop broken I2C block read support
+                   Add ICH10 support
   Module i2c-piix4: Minor cleanups (2.6 backport)
   Module i2c-sis5595: Minor cleanups (2.6 backport)

lm-sensors/trunk/README

@@ -52 +52 @@
   Intel ICH/ICH0/ICH2/ICH3/ICH4/ICH5/ICH6/ICH7/ICH8/ICH9 (82801xx)
   Intel 6300ESB, 631xESB/632xESB (ESB2)
-  Intel Tolapai
+  Intel Tolapai, ICH10
   Intel PIIX4 (used in many Intel chipsets)
   Intel I810/I810E/I815/I845G GMCH

lm-sensors/trunk/doc/busses/i2c-i801

@@ -17 +17 @@
   * Intel ICH7/ICH8/ICH9
   * Intel Tolapai
+  * Intel ICH10
     Datasheets: Publicly available at the Intel website
 

lm-sensors/trunk/kernel/busses/i2c-i801.c

@@ -35 +35 @@
     ICH8                283E   ("")
     ICH9                2930   ("")
+    Tolapai             5032   ("")
+    ICH10               3A30   ("")
+    ICH10               3A60   ("")
 
     This driver supports several versions of Intel's I/O Controller Hubs (ICH).
@@ -107 +110 @@
 #ifndef PCI_DEVICE_ID_INTEL_TOLAPAI_1
 #define PCI_DEVICE_ID_INTEL_TOLAPAI_1   0x5032
+#endif
+
+#ifndef PCI_DEVICE_ID_INTEL_ICH10_4
+#define PCI_DEVICE_ID_INTEL_ICH10_4     0x3a30
+#endif
+
+#ifndef PCI_DEVICE_ID_INTEL_ICH10_5
+#define PCI_DEVICE_ID_INTEL_ICH10_5     0x3a60
 #endif
 
@@ -180 +191 @@
             dev->device == PCI_DEVICE_ID_INTEL_ICH8_5 ||
             dev->device == PCI_DEVICE_ID_INTEL_ICH9_6 ||
-            dev->device == PCI_DEVICE_ID_INTEL_TOLAPAI_1)
+            dev->device == PCI_DEVICE_ID_INTEL_TOLAPAI_1 ||
+            dev->device == PCI_DEVICE_ID_INTEL_ICH10_4 ||
+            dev->device == PCI_DEVICE_ID_INTEL_ICH10_5)
                 isich4 = 1;
         else
@@ -678 +691 @@
                 .subdevice =    PCI_ANY_ID,
         },
+        {
+                .vendor =       PCI_VENDOR_ID_INTEL,
+                .device =       PCI_DEVICE_ID_INTEL_ICH10_4,
+                .subvendor =    PCI_ANY_ID,
+                .subdevice =    PCI_ANY_ID,
+        },
+        {
+                .vendor =       PCI_VENDOR_ID_INTEL,
+                .device =       PCI_DEVICE_ID_INTEL_ICH10_5,
+                .subvendor =    PCI_ANY_ID,
+                .subdevice =    PCI_ANY_ID,
+        },
         { 0, }
 };