diff options
-rw-r--r-- | Documentation/hwmon/smsc47b397 | 8 | ||||
-rw-r--r-- | drivers/hwmon/smsc47b397.c | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Documentation/hwmon/smsc47b397 b/Documentation/hwmon/smsc47b397 index da9d80c96432..20682f15ae41 100644 --- a/Documentation/hwmon/smsc47b397 +++ b/Documentation/hwmon/smsc47b397 | |||
@@ -3,6 +3,7 @@ Kernel driver smsc47b397 | |||
3 | 3 | ||
4 | Supported chips: | 4 | Supported chips: |
5 | * SMSC LPC47B397-NC | 5 | * SMSC LPC47B397-NC |
6 | * SMSC SCH5307-NS | ||
6 | Prefix: 'smsc47b397' | 7 | Prefix: 'smsc47b397' |
7 | Addresses scanned: none, address read from Super I/O config space | 8 | Addresses scanned: none, address read from Super I/O config space |
8 | Datasheet: In this file | 9 | Datasheet: In this file |
@@ -12,11 +13,14 @@ Authors: Mark M. Hoffman <mhoffman@lightlink.com> | |||
12 | 13 | ||
13 | November 23, 2004 | 14 | November 23, 2004 |
14 | 15 | ||
15 | The following specification describes the SMSC LPC47B397-NC sensor chip | 16 | The following specification describes the SMSC LPC47B397-NC[1] sensor chip |
16 | (for which there is no public datasheet available). This document was | 17 | (for which there is no public datasheet available). This document was |
17 | provided by Craig Kelly (In-Store Broadcast Network) and edited/corrected | 18 | provided by Craig Kelly (In-Store Broadcast Network) and edited/corrected |
18 | by Mark M. Hoffman <mhoffman@lightlink.com>. | 19 | by Mark M. Hoffman <mhoffman@lightlink.com>. |
19 | 20 | ||
21 | [1] And SMSC SCH5307-NS, which has a different device ID but is otherwise | ||
22 | compatible. | ||
23 | |||
20 | * * * * * | 24 | * * * * * |
21 | 25 | ||
22 | Methods for detecting the HP SIO and reading the thermal data on a dc7100. | 26 | Methods for detecting the HP SIO and reading the thermal data on a dc7100. |
@@ -127,7 +131,7 @@ OUT DX,AL | |||
127 | The registers of interest for identifying the SIO on the dc7100 are Device ID | 131 | The registers of interest for identifying the SIO on the dc7100 are Device ID |
128 | (0x20) and Device Rev (0x21). | 132 | (0x20) and Device Rev (0x21). |
129 | 133 | ||
130 | The Device ID will read 0X6F | 134 | The Device ID will read 0x6F (for SCH5307-NS, 0x81) |
131 | The Device Rev currently reads 0x01 | 135 | The Device Rev currently reads 0x01 |
132 | 136 | ||
133 | Obtaining the HWM Base Address. | 137 | Obtaining the HWM Base Address. |
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c index 7fe71576dea4..37ed8b33f01a 100644 --- a/drivers/hwmon/smsc47b397.c +++ b/drivers/hwmon/smsc47b397.c | |||
@@ -299,7 +299,7 @@ static int __init smsc47b397_find(unsigned short *addr) | |||
299 | superio_enter(); | 299 | superio_enter(); |
300 | id = superio_inb(SUPERIO_REG_DEVID); | 300 | id = superio_inb(SUPERIO_REG_DEVID); |
301 | 301 | ||
302 | if (id != 0x6f) { | 302 | if ((id != 0x6f) && (id != 0x81)) { |
303 | superio_exit(); | 303 | superio_exit(); |
304 | return -ENODEV; | 304 | return -ENODEV; |
305 | } | 305 | } |
@@ -310,8 +310,9 @@ static int __init smsc47b397_find(unsigned short *addr) | |||
310 | *addr = (superio_inb(SUPERIO_REG_BASE_MSB) << 8) | 310 | *addr = (superio_inb(SUPERIO_REG_BASE_MSB) << 8) |
311 | | superio_inb(SUPERIO_REG_BASE_LSB); | 311 | | superio_inb(SUPERIO_REG_BASE_LSB); |
312 | 312 | ||
313 | printk(KERN_INFO "smsc47b397: found SMSC LPC47B397-NC " | 313 | printk(KERN_INFO "smsc47b397: found SMSC %s " |
314 | "(base address 0x%04x, revision %u)\n", *addr, rev); | 314 | "(base address 0x%04x, revision %u)\n", |
315 | id == 0x81 ? "SCH5307-NS" : "LPC47B397-NC", *addr, rev); | ||
315 | 316 | ||
316 | superio_exit(); | 317 | superio_exit(); |
317 | return 0; | 318 | return 0; |