Changeset 5708

Timestamp:

04/06/09 19:05:54 (4 years ago)

Author:

khali

Message:

Add National Semiconductor LM95241 detection.

Location:

lm-sensors/trunk

Files:

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

lm-sensors/trunk/CHANGES

@@ -8 +8 @@
                   Use dmidecode to find IPMI interfaces if available
                   Add Nuvoton W83795G/ADG detection
+                  Add National Semiconductor LM95241 detection
 
 3.1.0 "Happy Birthday Lina" (2009-02-28)

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

@@ -912 +912 @@
                 driver => "to-be-written",
                 i2c_addrs => [0x2b, 0x19, 0x2a],
-                i2c_detect => sub { lm95231_detect(@_); },
+                i2c_detect => sub { lm95231_detect(@_, 0); },
+        }, {
+                name => "National Semiconductor LM95241",
+                driver => "lm95241",
+                i2c_addrs => [0x2b, 0x19, 0x2a],
+                i2c_detect => sub { lm95231_detect(@_, 1); },
         }, {
                 name => "National Semiconductor LM63",
@@ -3908 +3913 @@
 }
 
+# Chip to detect: 0 = LM95231, 1 = LM95241
 # Registers used:
-#   0x03: Configuration
+#   0x02: Status (3 unused bits)
+#   0x03: Configuration (3 unused bits)
+#   0x06: Remote diode filter control (6 unused bits)
+#   0x30: Remote diode model type select (6 unused bits)
 #   0xfe: Manufacturer ID
 #   0xff: Revision ID
 sub lm95231_detect
 {
-        my ($file, $addr) = @_;
+        my ($file, $addr, $chip) = @_;
         my $mid = i2c_smbus_read_byte_data($file, 0xfe);
         my $cid = i2c_smbus_read_byte_data($file, 0xff);
-        my $conf = i2c_smbus_read_byte_data($file, 0x03);
-
-        return if ($conf & 0x89) != 0;
-        return if $mid != 0x01;         # National Semiconductor
-        return if $cid != 0xa1;         # LM95231
+
+        return if $mid != 0x01;                         # National Semiconductor
+        return if $chip == 0 && $cid != 0xa1;           # LM95231
+        return if $chip == 1 && $cid != 0xa4;           # LM95231
+
+        return if i2c_smbus_read_byte_data($file, 0x02) & 0x70;
+        return if i2c_smbus_read_byte_data($file, 0x03) & 0x89;
+        return if i2c_smbus_read_byte_data($file, 0x06) & 0xfa;
+        return if i2c_smbus_read_byte_data($file, 0x30) & 0xfa;
 
         return 6;