diff --git a/CHANGES b/CHANGES index 14f84a64..4572f50b 100644 --- a/CHANGES +++ b/CHANGES @@ -21,6 +21,7 @@ ask CVS about it: File README.thinkpad: Update File doc/chips/lm63: New File kernel/chips/Module.mk: Resync module list with mkpatch + Module i2c-ipmb: Remove from build since it doesn't work Module lm63: New driver for the National Semiconductor LM63 Module lm83: Use signed types for temperatures Check limits on register writes @@ -31,6 +32,7 @@ ask CVS about it: Check limits on register writes Module lm93: Added module parameter for VID pin input thresholds. Module pc87360: Support secondary Super-I/O address + Module smsc47m1: Add support for 47M15x and 47M192 (fans only) Library: Add lm63 support Program i2cset: Written byte/word can be masked Program sensors: Add lm63 support diff --git a/doc/chips/smsc47m1 b/doc/chips/smsc47m1 index 344d0fc8..0061b17e 100644 --- a/doc/chips/smsc47m1 +++ b/doc/chips/smsc47m1 @@ -32,6 +32,10 @@ Description The Standard Microsystems Corporation (SMSC) 47M1xx Super I/O chips contain monitoring and PWM control circuitry for two fans. +The 47M15x and 47M192 chips contain a full 'hardware monitoring block' +in addition to the fan monitoring and control. The hardware monitoring +block is not yet supported by the driver. + FAN rotation speeds are reported in RPM (rotations per minute). An alarm is triggered if the rotation speed has dropped below a programmable limit. FAN readings can be divided by a programmable divider (1, 2, 4 or 8) to give diff --git a/kernel/chips/smsc47m1.c b/kernel/chips/smsc47m1.c index 6d83da3e..1da44c2b 100644 --- a/kernel/chips/smsc47m1.c +++ b/kernel/chips/smsc47m1.c @@ -86,7 +86,7 @@ superio_exit(void) * The 47M15x and 47M192 chips "with hardware monitoring block" * can do much more besides (device id 0x60). */ -#define SMSC_DEVID_MATCH(id) ((id) == 0x51 || (id) == 0x59 || (id) == 0x5F) +#define SMSC_DEVID_MATCH(id) ((id) == 0x51 || (id) == 0x59 || (id) == 0x5F || (id) == 0x60) #define SMSC_ACT_REG 0x30 #define SMSC_BASE_REG 0x60