Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2dbbdb35746fdc1a3c3bc5b07f197a90e53b059e
Commit:     2dbbdb35746fdc1a3c3bc5b07f197a90e53b059e
Parent:     b74f3fdd98c7186930b8ee841dc542dfdba95473
Author:     Juerg Haefliger <[EMAIL PROTECTED]>
AuthorDate: Wed Jun 20 15:41:33 2007 -0700
Committer:  Mark M. Hoffman <[EMAIL PROTECTED]>
CommitDate: Thu Jul 19 14:22:15 2007 -0400

    hwmon: add SCH5317 to smsc47b397 driver
    
    This patch adds the SMSC SCH5317 chip (device ID 0x85) as a supported
    device to the smsc47b397 driver.
    
    Signed-off-by: Juerg Haefliger <juergh at gmail.com>
    Signed-off-by: Mark M. Hoffman <[EMAIL PROTECTED]>
---
 Documentation/hwmon/smsc47b397 |    7 ++++---
 drivers/hwmon/smsc47b397.c     |    5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Documentation/hwmon/smsc47b397 b/Documentation/hwmon/smsc47b397
index 20682f1..3a43b69 100644
--- a/Documentation/hwmon/smsc47b397
+++ b/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 <[EMAIL PROTECTED]>.
 
-[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/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c
index 943abbd..3b65b0e 100644
--- a/drivers/hwmon/smsc47b397.c
+++ b/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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to