From 5d82cee17948c917921e2a786f3dc95358a9732b Mon Sep 17 00:00:00 2001
From: Juerg Haefliger <juergh@gmail.com>
Date: Wed, 20 Jun 2007 15:41:33 -0700
Subject: [PATCH] --- yaml --- r: 61799 b: refs/heads/master c:
 2dbbdb35746fdc1a3c3bc5b07f197a90e53b059e h: refs/heads/master i:   61797:
 5050aaf8094ad03acc51b4d02fb527a07e5f7e96   61795:
 f7350cf9724e8013b70c118f0cf137bedd5d4eb6   61791:
 bff5676e5a4d50f88d702e4265ce994f07a003ba v: v3

---
 [refs]                               | 2 +-
 trunk/Documentation/hwmon/smsc47b397 | 7 ++++---
 trunk/drivers/hwmon/smsc47b397.c     | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 432a43a4ed1a..20c0fdc6ca87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b74f3fdd98c7186930b8ee841dc542dfdba95473
+refs/heads/master: 2dbbdb35746fdc1a3c3bc5b07f197a90e53b059e
diff --git a/trunk/Documentation/hwmon/smsc47b397 b/trunk/Documentation/hwmon/smsc47b397
index 20682f15ae41..3a43b6948924 100644
--- a/trunk/Documentation/hwmon/smsc47b397
+++ b/trunk/Documentation/hwmon/smsc47b397
@@ -4,6 +4,7 @@ Kernel driver smsc47b397
 Supported chips:
   * SMSC LPC47B397-NC
   * SMSC SCH5307-NS
+  * SMSC SCH5317
     Prefix: 'smsc47b397'
     Addresses scanned: none, address read from Super I/O config space
     Datasheet: In this file
@@ -18,8 +19,8 @@ The following specification describes the SMSC LPC47B397-NC[1] sensor chip
 provided by Craig Kelly (In-Store Broadcast Network) and edited/corrected
 by Mark M. Hoffman <mhoffman@lightlink.com>.
 
-[1] And SMSC SCH5307-NS, which has a different device ID but is otherwise
-compatible.
+[1] And SMSC SCH5307-NS and SCH5317, which have different device IDs but are
+otherwise compatible.
 
 * * * * *
 
@@ -131,7 +132,7 @@ OUT	DX,AL
 The registers of interest for identifying the SIO on the dc7100 are Device ID
 (0x20) and Device Rev  (0x21).
 
-The Device ID will read 0x6F (for SCH5307-NS, 0x81)
+The Device ID will read 0x6F (0x81 for SCH5307-NS, and 0x85 for SCH5317)
 The Device Rev currently reads 0x01
 
 Obtaining the HWM Base Address.
diff --git a/trunk/drivers/hwmon/smsc47b397.c b/trunk/drivers/hwmon/smsc47b397.c
index 943abbd95ab5..3b65b0e61c49 100644
--- a/trunk/drivers/hwmon/smsc47b397.c
+++ b/trunk/drivers/hwmon/smsc47b397.c
@@ -333,7 +333,7 @@ static int __init smsc47b397_find(unsigned short *addr)
 	superio_enter();
 	id = superio_inb(SUPERIO_REG_DEVID);
 
-	if ((id != 0x6f) && (id != 0x81)) {
+	if ((id != 0x6f) && (id != 0x81) && (id != 0x85)) {
 		superio_exit();
 		return -ENODEV;
 	}
@@ -346,7 +346,8 @@ static int __init smsc47b397_find(unsigned short *addr)
 
 	printk(KERN_INFO DRVNAME ": found SMSC %s "
 		"(base address 0x%04x, revision %u)\n",
-		id == 0x81 ? "SCH5307-NS" : "LPC47B397-NC", *addr, rev);
+		id == 0x81 ? "SCH5307-NS" : id == 0x85 ? "SCH5317" :
+	       "LPC47B397-NC", *addr, rev);
 
 	superio_exit();
 	return 0;