diff options
-rw-r--r-- | Documentation/hwmon/smsc47b397 | 7 | ||||
-rw-r--r-- | drivers/hwmon/smsc47b397.c | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Documentation/hwmon/smsc47b397 b/Documentation/hwmon/smsc47b397 index 20682f15ae41..3a43b6948924 100644 --- a/Documentation/hwmon/smsc47b397 +++ b/Documentation/hwmon/smsc47b397 | |||
@@ -4,6 +4,7 @@ Kernel driver smsc47b397 | |||
4 | Supported chips: | 4 | Supported chips: |
5 | * SMSC LPC47B397-NC | 5 | * SMSC LPC47B397-NC |
6 | * SMSC SCH5307-NS | 6 | * SMSC SCH5307-NS |
7 | * SMSC SCH5317 | ||
7 | Prefix: 'smsc47b397' | 8 | Prefix: 'smsc47b397' |
8 | Addresses scanned: none, address read from Super I/O config space | 9 | Addresses scanned: none, address read from Super I/O config space |
9 | Datasheet: In this file | 10 | Datasheet: In this file |
@@ -18,8 +19,8 @@ The following specification describes the SMSC LPC47B397-NC[1] sensor chip | |||
18 | provided by Craig Kelly (In-Store Broadcast Network) and edited/corrected | 19 | provided by Craig Kelly (In-Store Broadcast Network) and edited/corrected |
19 | by Mark M. Hoffman <mhoffman@lightlink.com>. | 20 | by Mark M. Hoffman <mhoffman@lightlink.com>. |
20 | 21 | ||
21 | [1] And SMSC SCH5307-NS, which has a different device ID but is otherwise | 22 | [1] And SMSC SCH5307-NS and SCH5317, which have different device IDs but are |
22 | compatible. | 23 | otherwise compatible. |
23 | 24 | ||
24 | * * * * * | 25 | * * * * * |
25 | 26 | ||
@@ -131,7 +132,7 @@ OUT DX,AL | |||
131 | The registers of interest for identifying the SIO on the dc7100 are Device ID | 132 | The registers of interest for identifying the SIO on the dc7100 are Device ID |
132 | (0x20) and Device Rev (0x21). | 133 | (0x20) and Device Rev (0x21). |
133 | 134 | ||
134 | The Device ID will read 0x6F (for SCH5307-NS, 0x81) | 135 | The Device ID will read 0x6F (0x81 for SCH5307-NS, and 0x85 for SCH5317) |
135 | The Device Rev currently reads 0x01 | 136 | The Device Rev currently reads 0x01 |
136 | 137 | ||
137 | Obtaining the HWM Base Address. | 138 | Obtaining the HWM Base Address. |
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c index 943abbd95ab5..3b65b0e61c49 100644 --- a/drivers/hwmon/smsc47b397.c +++ b/drivers/hwmon/smsc47b397.c | |||
@@ -333,7 +333,7 @@ static int __init smsc47b397_find(unsigned short *addr) | |||
333 | superio_enter(); | 333 | superio_enter(); |
334 | id = superio_inb(SUPERIO_REG_DEVID); | 334 | id = superio_inb(SUPERIO_REG_DEVID); |
335 | 335 | ||
336 | if ((id != 0x6f) && (id != 0x81)) { | 336 | if ((id != 0x6f) && (id != 0x81) && (id != 0x85)) { |
337 | superio_exit(); | 337 | superio_exit(); |
338 | return -ENODEV; | 338 | return -ENODEV; |
339 | } | 339 | } |
@@ -346,7 +346,8 @@ static int __init smsc47b397_find(unsigned short *addr) | |||
346 | 346 | ||
347 | printk(KERN_INFO DRVNAME ": found SMSC %s " | 347 | printk(KERN_INFO DRVNAME ": found SMSC %s " |
348 | "(base address 0x%04x, revision %u)\n", | 348 | "(base address 0x%04x, revision %u)\n", |
349 | id == 0x81 ? "SCH5307-NS" : "LPC47B397-NC", *addr, rev); | 349 | id == 0x81 ? "SCH5307-NS" : id == 0x85 ? "SCH5317" : |
350 | "LPC47B397-NC", *addr, rev); | ||
350 | 351 | ||
351 | superio_exit(); | 352 | superio_exit(); |
352 | return 0; | 353 | return 0; |