From 7946ac235d27752c270deeca3a372591227e1206 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 15 Feb 2007 10:05:43 +0000 Subject: [PATCH] Add ATI SB600 SMBus support, backported from Linux 2.6. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4320 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + README | 2 +- doc/busses/i2c-piix4 | 2 +- kernel/busses/i2c-piix4.c | 10 +++++++++- mkpatch/mkpatch.pl | 8 +++++--- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 8ba6c826..56e48330 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,7 @@ SVN HEAD Man page i2cdetect.8: Scanning range can be restricted Module i2c-amd8111: Cleanups (2.6 backport) Fix initialization race (2.6 backport) + Module i2c-piix4: Add ATI SB600 support (2.6 backport) Module i2c-viapro: Add CX700 support (2.6 backport) Programs i2cdetect, i2cdump, isadump: Flush output in real time Program sensors-detect: Only probe relevant I2C addresses diff --git a/README b/README index ce81a9a2..c8fc488b 100644 --- a/README +++ b/README @@ -47,7 +47,7 @@ At least the following I2C/SMBus adapters are supported: AMD 756, 766, 768 and 8111 AMD 8111 SMBus 2.0 Apple Hydra (used on some PPC machines) - ATI IXP200, IXP300, IXP400 + ATI IXP200, IXP300, IXP400, SB600 DEC 21272/21274 (Tsunami/Typhoon - on Alpha boards) Intel ICH/ICH0/ICH2/ICH3/ICH4/ICH5/ICH6/ICH7/ICH8/ICH9 (82801xx) Intel 6300ESB, 631xESB/632xESB (ESB2) diff --git a/doc/busses/i2c-piix4 b/doc/busses/i2c-piix4 index bf3e29ff..d7cce66e 100644 --- a/doc/busses/i2c-piix4 +++ b/doc/busses/i2c-piix4 @@ -9,7 +9,7 @@ Supported adapters: Datasheet: Publicly available at the Intel website * ServerWorks OSB4, CSB5, CSB6 and HT-1000 southbridges Datasheet: Only available via NDA from ServerWorks - * ATI IXP southbridges IXP200, IXP300, IXP400 + * ATI IXP200, IXP300, IXP400 and SB600 southbridges Datasheet: Not publicly available * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge Datasheet: Publicly available at the SMSC website http://www.smsc.com diff --git a/kernel/busses/i2c-piix4.c b/kernel/busses/i2c-piix4.c index 90309ffa..94a4c301 100644 --- a/kernel/busses/i2c-piix4.c +++ b/kernel/busses/i2c-piix4.c @@ -23,7 +23,7 @@ Supports: Intel PIIX4, 440MX Serverworks OSB4, CSB5, CSB6, HT-1000 - ATI IXP200, IXP300, IXP400 + ATI IXP200, IXP300, IXP400, SB600 SMSC Victory66 Note: we assume there can only be one device, with one SMBus interface. @@ -438,6 +438,7 @@ static struct i2c_adapter piix4_adapter = { #define PCI_DEVICE_ID_ATI_IXP200_SMBUS 0x4353 #define PCI_DEVICE_ID_ATI_IXP300_SMBUS 0x4363 #define PCI_DEVICE_ID_ATI_IXP400_SMBUS 0x4372 +#define PCI_DEVICE_ID_ATI_IXP600_SMBUS 0x4385 #ifndef PCI_DEVICE_ID_SERVERWORKS_CSB6 #define PCI_DEVICE_ID_SERVERWORKS_CSB6 0x0203 @@ -474,6 +475,13 @@ static struct pci_device_id piix4_ids[] __devinitdata = { .subdevice = PCI_ANY_ID, .driver_data = 0, }, + { + .vendor = PCI_VENDOR_ID_ATI, + .device = PCI_DEVICE_ID_ATI_IXP600_SMBUS, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .driver_data = 0, + }, { .vendor = PCI_VENDOR_ID_SERVERWORKS, .device = PCI_DEVICE_ID_SERVERWORKS_OSB4, diff --git a/mkpatch/mkpatch.pl b/mkpatch/mkpatch.pl index 5fe3944c..2ab14c71 100755 --- a/mkpatch/mkpatch.pl +++ b/mkpatch/mkpatch.pl @@ -224,9 +224,11 @@ Intel 82371AB PIIX4(E), ServerWorks OSB4, CSB5, CSB6, HT-1000 CONFIG_I2C_PIIX4 If you say yes to this option, support will be included for the Intel PIIX4, PIIX4E, 443MX, Serverworks OSB4, CSB5, CSB6 and - HT-1000, ATI IXP200, IXP300 and IXP400, and SMSC Victory66 mainboard - I2C interfaces. This can also be built as a module which can be - inserted and removed while the kernel is running. + HT-1000, ATI IXP200, IXP300, IXP400 and SB600, and SMSC Victory66 + mainboard SMBus interfaces. + + This can also be built as a module which can be inserted and removed + while the kernel is running. Nvidia Nforce2/3/4 based Mainboard CONFIG_I2C_NFORCE2