aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2005-12-18 11:25:18 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-06 01:16:27 -0500
commit7c72ccf09b6debe55b8e049377ad3183ed4f4cb3 (patch)
treed9a4cfd4074c90a7ea1565449c304dcde8693c32
parenta4787c0d232e16e727b37205dc647337b8974f35 (diff)
[PATCH] i2c: i2c-nforce2 add nforce4 MCP-04 device ID
One more supported PCI ID for the i2c-nforce2 driver. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--Documentation/i2c/busses/i2c-nforce23
-rw-r--r--drivers/i2c/busses/i2c-nforce2.c2
-rw-r--r--include/linux/pci_ids.h1
3 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/i2c/busses/i2c-nforce2 b/Documentation/i2c/busses/i2c-nforce2
index e379e182e64f..d751282d9b2a 100644
--- a/Documentation/i2c/busses/i2c-nforce2
+++ b/Documentation/i2c/busses/i2c-nforce2
@@ -5,7 +5,8 @@ Supported adapters:
5 * nForce2 Ultra 400 MCP 10de:0084 5 * nForce2 Ultra 400 MCP 10de:0084
6 * nForce3 Pro150 MCP 10de:00D4 6 * nForce3 Pro150 MCP 10de:00D4
7 * nForce3 250Gb MCP 10de:00E4 7 * nForce3 250Gb MCP 10de:00E4
8 * nForce4 MCP 10de:0052 8 * nForce4 MCP 10de:0052
9 * nForce4 MCP-04 10de:0034
9 10
10Datasheet: not publically available, but seems to be similar to the 11Datasheet: not publically available, but seems to be similar to the
11 AMD-8111 SMBus 2.0 adapter. 12 AMD-8111 SMBus 2.0 adapter.
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index 4d18e6e5f159..2d80eb26f688 100644
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -30,6 +30,7 @@
30 nForce3 Pro150 MCP 00D4 30 nForce3 Pro150 MCP 00D4
31 nForce3 250Gb MCP 00E4 31 nForce3 250Gb MCP 00E4
32 nForce4 MCP 0052 32 nForce4 MCP 0052
33 nForce4 MCP-04 0034
33 34
34 This driver supports the 2 SMBuses that are included in the MCP of the 35 This driver supports the 2 SMBuses that are included in the MCP of the
35 nForce2/3/4 chipsets. 36 nForce2/3/4 chipsets.
@@ -257,6 +258,7 @@ static struct pci_device_id nforce2_ids[] = {
257 { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3_SMBUS) }, 258 { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3_SMBUS) },
258 { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SMBUS) }, 259 { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SMBUS) },
259 { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE4_SMBUS) }, 260 { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE4_SMBUS) },
261 { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SMBUS) },
260 { 0 } 262 { 0 }
261}; 263};
262 264
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 4f01710485cd..96a0403f61f6 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -976,6 +976,7 @@
976#define PCI_DEVICE_ID_NVIDIA_TNT_UNKNOWN 0x002a 976#define PCI_DEVICE_ID_NVIDIA_TNT_UNKNOWN 0x002a
977#define PCI_DEVICE_ID_NVIDIA_VTNT2 0x002C 977#define PCI_DEVICE_ID_NVIDIA_VTNT2 0x002C
978#define PCI_DEVICE_ID_NVIDIA_UVTNT2 0x002D 978#define PCI_DEVICE_ID_NVIDIA_UVTNT2 0x002D
979#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SMBUS 0x0034
979#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE 0x0035 980#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE 0x0035
980#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA 0x0036 981#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA 0x0036
981#define PCI_DEVICE_ID_NVIDIA_NVENET_10 0x0037 982#define PCI_DEVICE_ID_NVIDIA_NVENET_10 0x0037