aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorShane Huang <shane.huang@amd.com>2013-06-03 06:24:55 -0400
committerBjorn Helgaas <bhelgaas@google.com>2013-06-03 15:02:45 -0400
commitb996ac90f595dda271cbd858b136b45557fc1a57 (patch)
tree414b60c7077f3c8c135a9057611fb910171628e2 /drivers/i2c
parentfafe5c3d82a470d73de53e6b08eb4e28d974d895 (diff)
i2c-piix4: Add AMD CZ SMBus device ID
To add AMD CZ SMBus controller device ID. [bhelgaas: drop pci_ids.h update] Signed-off-by: Shane Huang <shane.huang@amd.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Tejun Heo <tj@kernel.org> Reviewed-by: Jean Delvare <khali@linux-fr.org> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/Kconfig1
-rw-r--r--drivers/i2c/busses/i2c-piix4.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 631736e2e7ed..4faf02b3657d 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -150,6 +150,7 @@ config I2C_PIIX4
150 ATI SB700/SP5100 150 ATI SB700/SP5100
151 ATI SB800 151 ATI SB800
152 AMD Hudson-2 152 AMD Hudson-2
153 AMD CZ
153 Serverworks OSB4 154 Serverworks OSB4
154 Serverworks CSB5 155 Serverworks CSB5
155 Serverworks CSB6 156 Serverworks CSB6
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 39ab78c1a02c..d05ad590af29 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -22,7 +22,7 @@
22 Intel PIIX4, 440MX 22 Intel PIIX4, 440MX
23 Serverworks OSB4, CSB5, CSB6, HT-1000, HT-1100 23 Serverworks OSB4, CSB5, CSB6, HT-1000, HT-1100
24 ATI IXP200, IXP300, IXP400, SB600, SB700/SP5100, SB800 24 ATI IXP200, IXP300, IXP400, SB600, SB700/SP5100, SB800
25 AMD Hudson-2 25 AMD Hudson-2, CZ
26 SMSC Victory66 26 SMSC Victory66
27 27
28 Note: we assume there can only be one device, with one or more 28 Note: we assume there can only be one device, with one or more
@@ -522,6 +522,7 @@ static DEFINE_PCI_DEVICE_TABLE(piix4_ids) = {
522 { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS) }, 522 { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS) },
523 { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS) }, 523 { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS) },
524 { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS) }, 524 { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS) },
525 { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x790b) },
525 { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, 526 { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,
526 PCI_DEVICE_ID_SERVERWORKS_OSB4) }, 527 PCI_DEVICE_ID_SERVERWORKS_OSB4) },
527 { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, 528 { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,