Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 2dbbdb35746fdc1a3c3bc5b07f197a90e53b059e

Authored by Juerg Haefliger
Committed by Mark M. Hoffman
1 parent b74f3fdd98
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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 <mhoffman@lightlink.com>

Showing 2 changed files with 7 additions and 5 deletions Side-by-side Diff

Documentation/hwmon/smsc47b397
Diff comments   View file @ 2dbbdb3
... ... @@ -4,6 +4,7 @@
4 4 Supported chips:
5 5 * SMSC LPC47B397-NC
6 6 * SMSC SCH5307-NS
  7 + * SMSC SCH5317
7 8 Prefix: 'smsc47b397'
8 9 Addresses scanned: none, address read from Super I/O config space
9 10 Datasheet: In this file
... ... @@ -18,8 +19,8 @@
18 19 provided by Craig Kelly (In-Store Broadcast Network) and edited/corrected
19 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   -compatible.
  22 +[1] And SMSC SCH5307-NS and SCH5317, which have different device IDs but are
  23 +otherwise compatible.
23 24  
24 25 * * * * *
25 26  
... ... @@ -131,7 +132,7 @@
131 132 The registers of interest for identifying the SIO on the dc7100 are Device ID
132 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 136 The Device Rev currently reads 0x01
136 137  
137 138 Obtaining the HWM Base Address.
drivers/hwmon/smsc47b397.c
Diff comments   View file @ 2dbbdb3
... ... @@ -333,7 +333,7 @@
333 333 superio_enter();
334 334 id = superio_inb(SUPERIO_REG_DEVID);
335 335  
336   - if ((id != 0x6f) && (id != 0x81)) {
  336 + if ((id != 0x6f) && (id != 0x81) && (id != 0x85)) {
337 337 superio_exit();
338 338 return -ENODEV;
339 339 }
... ... @@ -346,7 +346,8 @@
346 346  
347 347 printk(KERN_INFO DRVNAME ": found SMSC %s "
348 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 352 superio_exit();
352 353 return 0;