diff options
-rw-r--r-- | Documentation/hwmon/smsc47m1 | 7 | ||||
-rw-r--r-- | drivers/hwmon/smsc47m1.c | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Documentation/hwmon/smsc47m1 b/Documentation/hwmon/smsc47m1 index 34e6478c1425..c15bbe68264e 100644 --- a/Documentation/hwmon/smsc47m1 +++ b/Documentation/hwmon/smsc47m1 | |||
@@ -12,6 +12,10 @@ Supported chips: | |||
12 | http://www.smsc.com/main/datasheets/47m14x.pdf | 12 | http://www.smsc.com/main/datasheets/47m14x.pdf |
13 | http://www.smsc.com/main/tools/discontinued/47m15x.pdf | 13 | http://www.smsc.com/main/tools/discontinued/47m15x.pdf |
14 | http://www.smsc.com/main/datasheets/47m192.pdf | 14 | http://www.smsc.com/main/datasheets/47m192.pdf |
15 | * SMSC LPC47M997 | ||
16 | Addresses scanned: none, address read from Super I/O config space | ||
17 | Prefix: 'smsc47m1' | ||
18 | Datasheet: none | ||
15 | 19 | ||
16 | Authors: | 20 | Authors: |
17 | Mark D. Studebaker <mdsxyz123@yahoo.com>, | 21 | Mark D. Studebaker <mdsxyz123@yahoo.com>, |
@@ -30,6 +34,9 @@ The 47M15x and 47M192 chips contain a full 'hardware monitoring block' | |||
30 | in addition to the fan monitoring and control. The hardware monitoring | 34 | in addition to the fan monitoring and control. The hardware monitoring |
31 | block is not supported by the driver. | 35 | block is not supported by the driver. |
32 | 36 | ||
37 | No documentation is available for the 47M997, but it has the same device | ||
38 | ID as the 47M15x and 47M192 chips and seems to be compatible. | ||
39 | |||
33 | Fan rotation speeds are reported in RPM (rotations per minute). An alarm is | 40 | Fan rotation speeds are reported in RPM (rotations per minute). An alarm is |
34 | triggered if the rotation speed has dropped below a programmable limit. Fan | 41 | triggered if the rotation speed has dropped below a programmable limit. Fan |
35 | readings can be divided by a programmable divider (1, 2, 4 or 8) to give | 42 | readings can be divided by a programmable divider (1, 2, 4 or 8) to give |
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c index bbe93a0688ec..5905c1af88f2 100644 --- a/drivers/hwmon/smsc47m1.c +++ b/drivers/hwmon/smsc47m1.c | |||
@@ -3,7 +3,7 @@ | |||
3 | for hardware monitoring | 3 | for hardware monitoring |
4 | 4 | ||
5 | Supports the SMSC LPC47B27x, LPC47M10x, LPC47M13x, LPC47M14x, | 5 | Supports the SMSC LPC47B27x, LPC47M10x, LPC47M13x, LPC47M14x, |
6 | LPC47M15x and LPC47M192 Super-I/O chips. | 6 | LPC47M15x, LPC47M192 and LPC47M997 Super-I/O chips. |
7 | 7 | ||
8 | Copyright (C) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com> | 8 | Copyright (C) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com> |
9 | Copyright (C) 2004 Jean Delvare <khali@linux-fr.org> | 9 | Copyright (C) 2004 Jean Delvare <khali@linux-fr.org> |
@@ -356,6 +356,8 @@ static int __init smsc47m1_find(unsigned short *addr) | |||
356 | * 0x5F) and LPC47B27x (device id 0x51) have fan control. | 356 | * 0x5F) and LPC47B27x (device id 0x51) have fan control. |
357 | * The LPC47M15x and LPC47M192 chips "with hardware monitoring block" | 357 | * The LPC47M15x and LPC47M192 chips "with hardware monitoring block" |
358 | * can do much more besides (device id 0x60). | 358 | * can do much more besides (device id 0x60). |
359 | * The LPC47M997 is undocumented, but seems to be compatible with | ||
360 | * the LPC47M192, and has the same device id. | ||
359 | */ | 361 | */ |
360 | if (val == 0x51) | 362 | if (val == 0x51) |
361 | printk(KERN_INFO "smsc47m1: Found SMSC LPC47B27x\n"); | 363 | printk(KERN_INFO "smsc47m1: Found SMSC LPC47B27x\n"); |
@@ -364,7 +366,8 @@ static int __init smsc47m1_find(unsigned short *addr) | |||
364 | else if (val == 0x5F) | 366 | else if (val == 0x5F) |
365 | printk(KERN_INFO "smsc47m1: Found SMSC LPC47M14x\n"); | 367 | printk(KERN_INFO "smsc47m1: Found SMSC LPC47M14x\n"); |
366 | else if (val == 0x60) | 368 | else if (val == 0x60) |
367 | printk(KERN_INFO "smsc47m1: Found SMSC LPC47M15x/LPC47M192\n"); | 369 | printk(KERN_INFO "smsc47m1: Found SMSC " |
370 | "LPC47M15x/LPC47M192/LPC47M997\n"); | ||
368 | else { | 371 | else { |
369 | superio_exit(); | 372 | superio_exit(); |
370 | return -ENODEV; | 373 | return -ENODEV; |