Changeset 5941 for lm-sensors/trunk/prog

Timestamp:

03/13/11 14:25:51 (15 months ago)

Author:

khali

Message:

Add detection of SMSC SCH5627.

Files:

• lm-sensors/trunk/prog/detect/sensors-detect (modified) (10 diffs)

lm-sensors/trunk/prog/detect/sensors-detect

@@ -1403 +1403 @@
 #  devid: The device ID we have to match (base device)
 #  devid_mask (optional): Bitmask to apply before checking the device ID
+#  regs (optional): Register definitions, where they differ from the standard.
 #  logdev: The logical device containing the sensors
 #  check (optional): A function to refine the detection. Will be passed
@@ -1762 +1763 @@
                 driver => "not-a-sensor",
                 devid => 0x83,
+        }, {
+                name => "SMSC SCH5627 Super IO",
+                driver => "sch5627",
+                devid => 0xc6,
+                regs => {
+                        basereg_lsb => 0x66,
+                        basereg_msb => 0x67,
+                },
+                logdev => 0x0c,
+                features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
         }
 );
@@ -2235 +2246 @@
         }
         return 0;
+}
+
+# $_[0]: Reference to base hash
+# $_[1]: Reference to overlay hash
+# Result: Overlayed hash
+sub overlay_hash
+{
+        my ($base, $overlay) = @_;
+        my %result = %{$base};
+
+        foreach my $key (keys %{$overlay}) {
+                $result{$key} = $overlay->{$key};
+        }
+        return %result;
 }
 
@@ -3545 +3570 @@
 }
 
-use vars qw(%superio);
+use vars qw(%standard_superio);
 
 # The following are taken from the PNP ISA spec (so it's supposed
@@ -3553 +3578 @@
 #  actreg: The activation register within the logical device
 #  actmask: The activation bit in the activation register
-#  basereg: The I/O base register within the logical device
-%superio = (
+#  basereg_*: The I/O base registers within the logical device
+%standard_superio = (
         devidreg => 0x20,
         logdevreg => 0x07,
         actreg => 0x30,
         actmask => 0x01,
-        basereg => 0x60,
+        basereg_msb => 0x60,
+        basereg_lsb => 0x61,
 );
 
@@ -3581 +3607 @@
 
         # Save logical device number
-        outb($addrreg, $superio{logdevreg});
+        outb($addrreg, $standard_superio{logdevreg});
         $oldldn = inb($datareg);
 
         for ($ldn = 0; $ldn < 16; $ldn++) {
                 # Select logical device
-                outb($addrreg, $superio{logdevreg});
+                outb($addrreg, $standard_superio{logdevreg});
                 outb($datareg, $ldn);
 
                 # Read base I/O address
-                outb($addrreg, $superio{basereg});
+                outb($addrreg, $standard_superio{basereg_msb});
                 $addr = inb($datareg) << 8;
-                outb($addrreg, $superio{basereg} + 1);
+                outb($addrreg, $standard_superio{basereg_lsb});
                 $addr |= inb($datareg);
                 next unless ($addr & 0xfff8) == $typical_addr;
@@ -3602 +3628 @@
 
         # Be nice, restore original logical device
-        outb($addrreg, $superio{logdevreg});
+        outb($addrreg, $standard_superio{logdevreg});
         outb($datareg, $oldldn);
 }
@@ -3611 +3637 @@
         my ($addrreg, $datareg, $chip) = @_;
         my ($val, $addr);
+        my %superio;
+
+        # Use chip-specific registers if provided
+        if (exists $chip->{regs}) {
+                %superio = overlay_hash(\%standard_superio, $chip->{regs});
+        } else {
+                %superio = %standard_superio;
+        }
 
         if (exists $chip->{check}) {
@@ -3637 +3671 @@
 
         # Get the IO base address
-        outb($addrreg, $superio{basereg});
+        outb($addrreg, $superio{basereg_msb});
         $addr = inb($datareg);
-        outb($addrreg, $superio{basereg} + 1);
+        outb($addrreg, $superio{basereg_lsb});
         $addr = ($addr << 8) | inb($datareg);
 
@@ -3722 +3756 @@
 
                 # did it work?
-                outb($addrreg, $superio{devidreg});
+                outb($addrreg, $standard_superio{devidreg});
                 $val = inb($datareg);
-                outb($addrreg, $superio{devidreg} + 1);
+                outb($addrreg, $standard_superio{devidreg} + 1);
                 $val = ($val << 8) | inb($datareg);
                 if ($val == 0x0000 || $val == 0xffff) {