diff options
-rw-r--r-- | Documentation/hwmon/smsc47m1 | 4 | ||||
-rw-r--r-- | drivers/hwmon/Kconfig | 4 | ||||
-rw-r--r-- | drivers/hwmon/smsc47m1.c | 11 |
3 files changed, 11 insertions, 8 deletions
diff --git a/Documentation/hwmon/smsc47m1 b/Documentation/hwmon/smsc47m1 index c15bbe68264e..04a11124f667 100644 --- a/Documentation/hwmon/smsc47m1 +++ b/Documentation/hwmon/smsc47m1 | |||
@@ -2,12 +2,14 @@ Kernel driver smsc47m1 | |||
2 | ====================== | 2 | ====================== |
3 | 3 | ||
4 | Supported chips: | 4 | Supported chips: |
5 | * SMSC LPC47B27x, LPC47M10x, LPC47M13x, LPC47M14x, LPC47M15x and LPC47M192 | 5 | * SMSC LPC47B27x, LPC47M112, LPC47M10x, LPC47M13x, LPC47M14x, |
6 | LPC47M15x and LPC47M192 | ||
6 | Addresses scanned: none, address read from Super I/O config space | 7 | Addresses scanned: none, address read from Super I/O config space |
7 | Prefix: 'smsc47m1' | 8 | Prefix: 'smsc47m1' |
8 | Datasheets: | 9 | Datasheets: |
9 | http://www.smsc.com/main/datasheets/47b27x.pdf | 10 | http://www.smsc.com/main/datasheets/47b27x.pdf |
10 | http://www.smsc.com/main/datasheets/47m10x.pdf | 11 | http://www.smsc.com/main/datasheets/47m10x.pdf |
12 | http://www.smsc.com/main/datasheets/47m112.pdf | ||
11 | http://www.smsc.com/main/tools/discontinued/47m13x.pdf | 13 | http://www.smsc.com/main/tools/discontinued/47m13x.pdf |
12 | http://www.smsc.com/main/datasheets/47m14x.pdf | 14 | http://www.smsc.com/main/datasheets/47m14x.pdf |
13 | http://www.smsc.com/main/tools/discontinued/47m15x.pdf | 15 | http://www.smsc.com/main/tools/discontinued/47m15x.pdf |
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 9b88b25b6edb..e0dede7198c8 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig | |||
@@ -369,8 +369,8 @@ config SENSORS_SMSC47M1 | |||
369 | help | 369 | help |
370 | If you say yes here you get support for the integrated fan | 370 | If you say yes here you get support for the integrated fan |
371 | monitoring and control capabilities of the SMSC LPC47B27x, | 371 | monitoring and control capabilities of the SMSC LPC47B27x, |
372 | LPC47M10x, LPC47M13x, LPC47M14x, LPC47M15x, LPC47M192 and | 372 | LPC47M10x, LPC47M112, LPC47M13x, LPC47M14x, LPC47M15x, |
373 | LPC47M997 chips. | 373 | LPC47M192 and LPC47M997 chips. |
374 | 374 | ||
375 | The temperature and voltage sensor features of the LPC47M192 | 375 | The temperature and voltage sensor features of the LPC47M192 |
376 | and LPC47M997 are supported by another driver, select also | 376 | and LPC47M997 are supported by another driver, select also |
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c index 47132fd26b1b..beb881c4b2e8 100644 --- a/drivers/hwmon/smsc47m1.c +++ b/drivers/hwmon/smsc47m1.c | |||
@@ -2,8 +2,8 @@ | |||
2 | smsc47m1.c - Part of lm_sensors, Linux kernel modules | 2 | smsc47m1.c - Part of lm_sensors, Linux kernel modules |
3 | for hardware monitoring | 3 | for hardware monitoring |
4 | 4 | ||
5 | Supports the SMSC LPC47B27x, LPC47M10x, LPC47M13x, LPC47M14x, | 5 | Supports the SMSC LPC47B27x, LPC47M10x, LPC47M112, LPC47M13x, |
6 | LPC47M15x, LPC47M192 and LPC47M997 Super-I/O chips. | 6 | LPC47M14x, 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> |
@@ -380,8 +380,8 @@ static int __init smsc47m1_find(unsigned short *addr) | |||
380 | val = superio_inb(SUPERIO_REG_DEVID); | 380 | val = superio_inb(SUPERIO_REG_DEVID); |
381 | 381 | ||
382 | /* | 382 | /* |
383 | * SMSC LPC47M10x/LPC47M13x (device id 0x59), LPC47M14x (device id | 383 | * SMSC LPC47M10x/LPC47M112/LPC47M13x (device id 0x59), LPC47M14x |
384 | * 0x5F) and LPC47B27x (device id 0x51) have fan control. | 384 | * (device id 0x5F) and LPC47B27x (device id 0x51) have fan control. |
385 | * The LPC47M15x and LPC47M192 chips "with hardware monitoring block" | 385 | * The LPC47M15x and LPC47M192 chips "with hardware monitoring block" |
386 | * can do much more besides (device id 0x60). | 386 | * can do much more besides (device id 0x60). |
387 | * The LPC47M997 is undocumented, but seems to be compatible with | 387 | * The LPC47M997 is undocumented, but seems to be compatible with |
@@ -390,7 +390,8 @@ static int __init smsc47m1_find(unsigned short *addr) | |||
390 | if (val == 0x51) | 390 | if (val == 0x51) |
391 | printk(KERN_INFO "smsc47m1: Found SMSC LPC47B27x\n"); | 391 | printk(KERN_INFO "smsc47m1: Found SMSC LPC47B27x\n"); |
392 | else if (val == 0x59) | 392 | else if (val == 0x59) |
393 | printk(KERN_INFO "smsc47m1: Found SMSC LPC47M10x/LPC47M13x\n"); | 393 | printk(KERN_INFO "smsc47m1: Found SMSC " |
394 | "LPC47M10x/LPC47M112/LPC47M13x\n"); | ||
394 | else if (val == 0x5F) | 395 | else if (val == 0x5F) |
395 | printk(KERN_INFO "smsc47m1: Found SMSC LPC47M14x\n"); | 396 | printk(KERN_INFO "smsc47m1: Found SMSC LPC47M14x\n"); |
396 | else if (val == 0x60) | 397 | else if (val == 0x60) |