diff --git a/CHANGES b/CHANGES index 23b3a78d..9b5ec1e9 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,7 @@ SVN HEAD Library: Clean up pwm symbol names translation Add dme1737 support Man page sensors.conf.5: Update the chip statement section + Module i2c-nforce2: Add nForce MCP61, MCP65 support (2.6 backport) Program isadump: Detect when address bit 7 is a busy flag Program pwmconfig: Use smaller steps for low PWM values Program rrd: Support non-i2c devices (hwmon class) diff --git a/doc/busses/i2c-nforce2 b/doc/busses/i2c-nforce2 index c9213298..49f16b25 100644 --- a/doc/busses/i2c-nforce2 +++ b/doc/busses/i2c-nforce2 @@ -20,6 +20,8 @@ Supported adapters: (10de:0034, included in nForce4 MCP-04) (10de:0264, included in nForce4 MCP51) (10de:0368, included in nForce4 MCP55) + (10de:03eb, included in nForce MCP61) + (10de:0446, included in nForce MCP65) Datasheet: same as for nForce2 SMBus PCI interface Author: Hans-Frieder Vogt diff --git a/kernel/busses/i2c-nforce2.c b/kernel/busses/i2c-nforce2.c index b8ed6cf0..a84386f2 100644 --- a/kernel/busses/i2c-nforce2.c +++ b/kernel/busses/i2c-nforce2.c @@ -31,6 +31,8 @@ nForce4 MCP-04 0034 nForce4 MCP51 0264 nForce4 MCP55 0368 + nForce MCP61 03EB + nForce MCP65 0446 This driver supports the 2 SMBuses that are included in the MCP of the nForce2/3/4 chipsets. @@ -79,6 +81,8 @@ MODULE_DESCRIPTION("nForce2 SMBus driver"); #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SMBUS 0x0034 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SMBUS 0x0264 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS 0x0368 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SMBUS 0x03EB +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_SMBUS 0x0446 struct nforce2_smbus { @@ -309,6 +313,10 @@ static struct pci_device_id nforce2_ids[] = { PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SMBUS, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_SMBUS, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { 0 } };