From d2f8a04ae3e5b3931aebe6a37bbd0ccd8d616565 Mon Sep 17 00:00:00 2001 From: "Mark D. Studebaker" Date: Fri, 3 Aug 2001 02:06:12 +0000 Subject: [PATCH] update serverworks match string git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1155 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 3 ++- README | 2 +- doc/busses/i2c-piix4 | 4 ++-- kernel/busses/i2c-piix4.c | 12 +++++++++--- prog/detect/sensors-detect | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index e8396a7c..f7c0a8a6 100644 --- a/CHANGES +++ b/CHANGES @@ -26,6 +26,7 @@ ask CVS about it: Module i2c-ali15x3: Allow force_addr=0xaddr; enable if not enabled. Module i2c-amd756: Add AMD 766 support Module i2c-i801: Fix 82801BA detection broken by kernel 2.4.6 + Module i2c-piix4: Add Serverworks CSB5 support Module i2c-sis5595: Recognize unsupported chips and refuse to load Module adm1025: Fixed temp2 min/max writes Module ds1621: Add 12-bit precision mode @@ -35,7 +36,7 @@ ask CVS about it: Program sensors: it87 updates Program sensors-detect: Fix ADM1024 and ADM1025 detection; recognize unsupported SiS chips; - recognize AMD 766. + recognize AMD 766 and Serverworks CSB5. 2.6.0 (20010612) NOTE: i2c-2.6.0 MUST BE be compiled AND installed first!!! diff --git a/README b/README index f53c58fa..2df60725 100644 --- a/README +++ b/README @@ -38,7 +38,7 @@ At least the following I2C/SMBus adapters are supported: Intel I801 ICH/ICH0/ICH2 (used in Intel 810, 810E, 815E, 820, 840 chipsets) Intel PIIX4 (used in many Intel chipsets) Intel I810/I815 GMCH - ServerWorks OSB4 + ServerWorks OSB4, CSB5 SiS 5595 3Dfx Voodoo 3 and Banshee VIA Technologies VT82C586B, VT82C596A/B, and VT82C686A diff --git a/doc/busses/i2c-piix4 b/doc/busses/i2c-piix4 index 0b84ebe5..b7e01993 100644 --- a/doc/busses/i2c-piix4 +++ b/doc/busses/i2c-piix4 @@ -5,7 +5,7 @@ Status: Complete and well-tested Supported adapters: * Intel 82371AB PIIX4 and PIIX4E Datasheet: Publicly available at the Intel website - * ServerWorks southbridges + * ServerWorks OSB4 and CSB5 southbridges Datasheet: only available via NDA from ServerWorks Author: Frodo Looijaard and Philip Edelbrock @@ -60,4 +60,4 @@ The PIIX4E is just an new version of the PIIX4; it is supported as well. The PIIX/PIIX3 does not implement an SMBus or I2C bus, so you can't use this driver on those mainboards. -The ServerWorks Southbridge is identical to the PIIX4 in I2C support. +The ServerWorks Southbridges are identical to the PIIX4 in I2C support. diff --git a/kernel/busses/i2c-piix4.c b/kernel/busses/i2c-piix4.c index 5d2af0d3..a6095d2e 100644 --- a/kernel/busses/i2c-piix4.c +++ b/kernel/busses/i2c-piix4.c @@ -19,7 +19,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* Note: we assume there can only be one PIIX4, with one SMBus interface */ +/* + Supports: + Intel PIIX4 + Serverworks OSB4, CSB5 + + Note: we assume there can only be one device, with one SMBus interface. +*/ #include #include @@ -145,7 +151,7 @@ static struct i2c_adapter piix4_adapter = { static int __initdata piix4_initialized; static unsigned short piix4_smba = 0; -static kind = 0; +static int kind = 0; /* Detect whether a PIIX4 can be found, and initialize it, where necessary. Note the differences between kernels with the old PCI BIOS interface and @@ -493,7 +499,7 @@ int __init i2c_piix4_init(void) return res; } piix4_initialized++; - sprintf(piix4_adapter.name, kind==1?"SMBus PIIX4 adapter at %04x":"SMBus OSB4 adapter at %04x", + sprintf(piix4_adapter.name, kind==1?"SMBus PIIX4 adapter at %04x":"SMBus OSB4/CSB5 adapter at %04x", piix4_smba); if ((res = i2c_add_adapter(&piix4_adapter))) { printk diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect index d880c340..572ef41d 100755 --- a/prog/detect/sensors-detect +++ b/prog/detect/sensors-detect @@ -401,7 +401,7 @@ use vars qw(@pci_adapters @chip_ids @undetectable_adapters); func => 0, procid => "ServerWorks South Bridge", driver => "i2c-piix4", - match => sub { $_[0] =~ /^SMBus OSB4 adapter at / }, + match => sub { $_[0] =~ /^SMBus OSB4/ }, } , { vendid => 0x1055,