From 82197ef51e857180021523bee0cbafa59c7f234b Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sat, 1 Sep 2007 08:19:13 +0000 Subject: [PATCH] Fix ATI SB700 SMBus support, add SB800 support (backport from Linux 2.6, original patch by Shane Huang). git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4739 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 2 +- README | 2 +- doc/busses/i2c-piix4 | 2 +- kernel/busses/i2c-piix4.c | 14 +++----------- mkpatch/mkpatch.pl | 4 ++-- prog/detect/sensors-detect | 7 ------- 6 files changed, 8 insertions(+), 23 deletions(-) diff --git a/CHANGES b/CHANGES index fe32343a..a896ba45 100644 --- a/CHANGES +++ b/CHANGES @@ -7,7 +7,7 @@ SVN HEAD Fix thmc50 support for Linux 2.6 Makefile: Fix kernel version detection (#2187) Module fscher: Add missing read of control register (2.6 backport) - Module i2c-piix4: Add ATI SB700 support (2.6 backport) + Module i2c-piix4: Add ATI SB700 and SB800 support (2.6 backport) Module lm93: Fix an array overrun (2.6 backport) Program sensors: Fix a memory leak on error (with -u) Program sensors-detect: Don't probe i2c-isa as a regular i2c bus diff --git a/README b/README index b3132e8e..046096f7 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, SB600, SB700 + ATI IXP200, IXP300, IXP400, SB600, SB700, SB800 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 4c641982..4a631502 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 IXP200, IXP300, IXP400, SB600 and SB700 southbridges + * ATI IXP200, IXP300, IXP400, SB600, SB700 and SB800 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 66c55458..825c492e 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, SB600, SB700 + ATI IXP200, IXP300, IXP400, SB600, SB700, SB800 SMSC Victory66 Note: we assume there can only be one device, with one SMBus interface. @@ -439,8 +439,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 -#define PCI_DEVICE_ID_ATI_IXP700_SMBUS 0x4395 +#define PCI_DEVICE_ID_ATI_SBX00_SMBUS 0x4385 #ifndef PCI_DEVICE_ID_SERVERWORKS_CSB6 #define PCI_DEVICE_ID_SERVERWORKS_CSB6 0x0203 @@ -479,14 +478,7 @@ static struct pci_device_id piix4_ids[] __devinitdata = { }, { .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_ATI, - .device = PCI_DEVICE_ID_ATI_IXP700_SMBUS, + .device = PCI_DEVICE_ID_ATI_SBX00_SMBUS, .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, .driver_data = 0, diff --git a/mkpatch/mkpatch.pl b/mkpatch/mkpatch.pl index 52aac679..87ed4e38 100755 --- a/mkpatch/mkpatch.pl +++ b/mkpatch/mkpatch.pl @@ -225,8 +225,8 @@ 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, IXP400, SB600 and SB700, and SMSC - Victory66 mainboard SMBus interfaces. + HT-1000, ATI IXP200, IXP300, IXP400, SB600, SB700 and SB800, 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. diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect index a20039a3..74a17788 100755 --- a/prog/detect/sensors-detect +++ b/prog/detect/sensors-detect @@ -650,13 +650,6 @@ $revision =~ s/ \([^()]*\)//; driver => "i2c-piix4", match => qr/^SMBus PIIX4 adapter at /, } , - { - vendid => 0x1002, - devid => 0x4395, - procid => "ATI Technologies Inc SB700 SMBus", - driver => "i2c-piix4", - match => qr/^SMBus PIIX4 adapter at /, - }, { vendid => 0x100B, devid => 0x0500,