diff --git a/CHANGES b/CHANGES index 9737b91b..0ecaa31e 100644 --- a/CHANGES +++ b/CHANGES @@ -22,11 +22,12 @@ ask CVS about it: File doc/FAQ: More updates and additions Module fscpos: new (Fujitsu-Siemens Poseidon driver) Module i2c-amd756: Improve busy handling/printk's + Module i2c-i801: Add 82801CA/CAM support Module i2c-piix4: Add Intel 82443MX and SMSC Victory66 support Module i2c-viapro: Add Via VT8233 support Module via686a: Make limit initializations reliable Program sensors-detect: Add ALI1535 detection, - add Intel 82443MX detection, + add Intel 82443MX and 82801CA/CAM detection, add Via VT8233 detection, add ITE 8172G detection (driver in kernel 2.4.10) diff --git a/README b/README index 189325ad..f9ab2187 100644 --- a/README +++ b/README @@ -35,7 +35,7 @@ At least the following I2C/SMBus adapters are supported: AMD 756, 766 Apple Hydra (used on some PPC machines) DEC 21272/21274 (Tsunami/Typhoon - on Alpha boards) - Intel I801 ICH/ICH0/ICH2 (used in Intel 810, 810E, 815E, 820, 840 chipsets) + Intel I801 ICH/ICH0/ICH2/ICH3 (used in Intel 810, 810E, 815E, 820, 840 chipsets) Intel PIIX4 (used in many Intel chipsets) Intel I810/I815 GMCH Intel 82443MX (440MX) diff --git a/doc/busses/i2c-i801 b/doc/busses/i2c-i801 index 80791d4b..0b6c4285 100644 --- a/doc/busses/i2c-i801 +++ b/doc/busses/i2c-i801 @@ -7,6 +7,7 @@ Supported adapters: * Intel 82801AA and 82801AB (ICH and ICH0 - part of the '810' and '810E' chipsets) * Intel 82801BA (ICH2 - part of the '815E' chipset) + * Intel 82801CA/CAM (ICH3) Datasheets: Publicly available at the Intel website Author: Frodo Looijaard , Philip Edelbrock @@ -26,11 +27,11 @@ Description ----------- The ICH (properly known as the 82801AA), ICH0 (82801AB), -and ICH2 (82801BA) are Intel chips that are a part of +ICH2 (82801BA) and ICH3 (82801CA/CAM) are Intel chips that are a part of Intel's '810' chipset for Celeron-based PCs, -'810E' chipset for Pentium-based PCs, and newer '815E' chipset. +'810E' chipset for Pentium-based PCs, '815E' chipset, and others. -The ICH chips contain about SEVEN separate PCI functions +The ICH chips contain at least SEVEN separate PCI functions in TWO logical PCI devices. An output of lspci will show something similar to the following: diff --git a/kernel/busses/i2c-i801.c b/kernel/busses/i2c-i801.c index 04f7e122..f6383ac8 100644 --- a/kernel/busses/i2c-i801.c +++ b/kernel/busses/i2c-i801.c @@ -21,8 +21,14 @@ */ /* - This driver supports the Intel 82801AA, 82801AB, and 82801BA - I/O Controller Hubs (ICH). They are similar to the PIIX4 and are part + SUPPORTED DEVICES PCI ID + 82801AA 2413 + 82801AB 2423 + 82801BA 2443 + 82801CA/CAM 2483 + + 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 of Intel's '810' and other chipsets. See the doc/busses/i2c-i801 file for details. */ @@ -50,10 +56,12 @@ #ifndef PCI_DEVICE_ID_INTEL_82801BA_2 #define PCI_DEVICE_ID_INTEL_82801BA_2 0x2443 #endif +#define PCI_DEVICE_ID_INTEL_82801CA_SMBUS 0x2483 static int supported[] = {PCI_DEVICE_ID_INTEL_82801AA_3, PCI_DEVICE_ID_INTEL_82801AB_3, PCI_DEVICE_ID_INTEL_82801BA_2, + PCI_DEVICE_ID_INTEL_82801CA_SMBUS, 0 }; /* I801 SMBus address offsets */ diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect index 3d48aff8..ec614902 100755 --- a/prog/detect/sensors-detect +++ b/prog/detect/sensors-detect @@ -88,6 +88,14 @@ use vars qw(@pci_adapters @chip_ids @undetectable_adapters); driver => "i2c-i801", match => sub { $_[0] =~ /^SMBus I801 adapter at [0-9,a-f]{4}/ }, } , + { + vendid => 0x8086, + devid => 0x2483, + func => 3, + procid => "Intel 82801CA/CAM ICH3", + driver => "i2c-i801", + match => sub { $_[0] =~ /^SMBus I801 adapter at [0-9,a-f]{4}/ }, + } , { vendid => 0x1106, devid => 0x3040,