Changeset 6018

Timestamp:

01/31/12 13:55:39 (4 months ago)

Author:

khali

Message:

Add detection of the National Semiconductor (now Texas Instruments)
LM96080. It is functionally compatible with the LM80 but detection is
completely different.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/detect/sensors-detect (modified) (4 diffs)

lm-sensors/trunk/CHANGES

@@ -19 +19 @@
                   Add detection of GMT G781
                   Properly handle Super-I/O chips without logical device
+                  Add detection of National Semiconductor LM96080
 
 3.3.1 (2011-07-21)

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

@@ -541 +541 @@
                 driver => "lm80",
                 i2c_addrs => [0x28..0x2f],
-                i2c_detect => sub { lm80_detect(@_); },
+                i2c_detect => sub { lm80_detect(@_, 0); },
+        }, {
+                name => "National Semiconductor LM96080",
+                driver => "lm80",
+                i2c_addrs => [0x28..0x2f],
+                i2c_detect => sub { lm80_detect(@_, 1); },
         }, {
                 name => "National Semiconductor LM85",
@@ -4260 +4265 @@
 }
 
+# Chip to detect: 0 = LM80, 1 = LM96080
 # Registers used:
 #   0x00: Configuration register
 #   0x02: Interrupt state register
-#   0x2a-0x3d: Limits registers
-# This one is easily misdetected since it doesn't provide identification
+#   0x07: Converstion rate register (LM96080 only)
+#   0x2a-0x3d: Limits registers (LM80 only)
+#   0x3e: Manufacturer's ID register (LM96080 only)
+#   0x3f: Steppind/die revision ID register (LM96080 only)
+# The LM80 is easily misdetected since it doesn't provide identification
 # registers. So we have to use some tricks:
 #   - 6-bit addressing, so limits readings modulo 0x40 should be unchanged
@@ -4277 +4286 @@
 sub lm80_detect
 {
-        my ($file, $addr) = @_;
+        my ($file, $addr, $chip) = @_;
         my ($i, $reg);
 
@@ -4283 +4292 @@
         return if (i2c_smbus_read_byte_data($file, 0x02) & 0xc0) != 0;
 
-        for ($i = 0x2a; $i <= 0x3d; $i++) {
-                $reg = i2c_smbus_read_byte_data($file, $i);
-                return if i2c_smbus_read_byte_data($file, $i+0x40) != $reg;
-                return if i2c_smbus_read_byte_data($file, $i+0x80) != $reg;
-                return if i2c_smbus_read_byte_data($file, $i+0xc0) != $reg;
-        }
-
-        # Refine a bit by checking whether limits are in the correct order
-        # (min<max for voltages, hyst<max for temperature). Since it is still
-        # possible that the chip is an LM80 with limits not properly set,
-        # a few "errors" are tolerated.
-        my $confidence = 0;
-        for ($i = 0x2a; $i <= 0x3a; $i++) {
+        if ($chip == 0) {
+                for ($i = 0x2a; $i <= 0x3d; $i++) {
+                        $reg = i2c_smbus_read_byte_data($file, $i);
+                        return if i2c_smbus_read_byte_data($file, $i+0x40) != $reg;
+                        return if i2c_smbus_read_byte_data($file, $i+0x80) != $reg;
+                        return if i2c_smbus_read_byte_data($file, $i+0xc0) != $reg;
+                }
+
+                # Refine a bit by checking whether limits are in the correct order
+                # (min<max for voltages, hyst<max for temperature). Since it is still
+                # possible that the chip is an LM80 with limits not properly set,
+                # a few "errors" are tolerated.
+                my $confidence = 0;
+                for ($i = 0x2a; $i <= 0x3a; $i++) {
+                        $confidence++
+                                if i2c_smbus_read_byte_data($file, $i) < i2c_smbus_read_byte_data($file, $i+1);
+                }
+                # hot temp<OS temp
                 $confidence++
-                        if i2c_smbus_read_byte_data($file, $i) < i2c_smbus_read_byte_data($file, $i+1);
-        }
-        # hot temp<OS temp
-        $confidence++
-                if i2c_smbus_read_byte_data($file, 0x38) < i2c_smbus_read_byte_data($file, 0x3a);
-
-        # Negative temperature limits are unlikely.
-        for ($i = 0x3a; $i <= 0x3d; $i++) {
-                $confidence++ if (i2c_smbus_read_byte_data($file, $i) & 0x80) == 0;
-        }
-
-        # $confidence is between 0 and 14
-        $confidence = ($confidence >> 1) - 4;
-        # $confidence is now between -4 and 3
-
-        return unless $confidence > 0;
-
-        return $confidence;
+                        if i2c_smbus_read_byte_data($file, 0x38) < i2c_smbus_read_byte_data($file, 0x3a);
+
+                # Negative temperature limits are unlikely.
+                for ($i = 0x3a; $i <= 0x3d; $i++) {
+                        $confidence++ if (i2c_smbus_read_byte_data($file, $i) & 0x80) == 0;
+                }
+
+                # $confidence is between 0 and 14
+                $confidence = ($confidence >> 1) - 4;
+                # $confidence is now between -4 and 3
+
+                return unless $confidence > 0;
+                return $confidence;
+        } elsif ($chip == 1) {
+                return if (i2c_smbus_read_byte_data($file, 0x07) & 0xfe) != 0;
+                return if i2c_smbus_read_byte_data($file, 0x3e) != 0x01;
+                return if i2c_smbus_read_byte_data($file, 0x3f) != 0x08;
+
+                return 6;
+        }
 }