Changeset 5984 for lm-sensors/trunk/prog

Timestamp:

07/10/11 21:22:53 (11 months ago)

Author:

groeck

Message:

Add code to detect LM95245

Files:

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

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

@@ -1009 +1009 @@
                 i2c_detect => sub { lm95231_detect(@_, 1); },
         }, {
+                name => "National Semiconductor LM95245",
+                driver => "lm95245",
+                i2c_addrs => [0x18, 0x19, 0x29, 0x4c, 0x4d],
+                i2c_detect => sub { lm95231_detect(@_, 2); },
+        }, {
                 name => "National Semiconductor LM63",
                 driver => "lm63",
@@ -4541 +4546 @@
 }
 
-# Chip to detect: 0 = LM95231, 1 = LM95241
+# Chip to detect: 0 = LM95231, 1 = LM95241, 2 = LM95245
 # Registers used:
 #   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)
+#   0x06: Remote diode filter control (6 unused bits, LM95231 and LM95241)
+#   0x30: Remote diode model type select (6 unused bits, LM95231 and LM95241)
+#   0x30: Local Temperature LSB (5 unused bits, LM95245)
+#   0x33: Status register 2 (6 unused bits, LM95245)
 #   0xfe: Manufacturer ID
 #   0xff: Revision ID
@@ -4556 +4563 @@
 
         return if $mid != 0x01;                         # National Semiconductor
-        return if $chip == 0 && $cid != 0xa1;           # LM95231
-        return if $chip == 1 && $cid != 0xa4;           # LM95241
-
-        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;
+
+        if ($chip == 0 || $chip == 1) {
+                return if $chip == 0 && $cid != 0xa1;   # LM95231
+                return if $chip == 1 && $cid != 0xa4;   # LM95241
+                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;
+        } elsif ($chip == 2) {
+                return if $cid != 0xb3;                 # LM95245
+                return if i2c_smbus_read_byte_data($file, 0x02) & 0x68;
+                return if i2c_smbus_read_byte_data($file, 0x03) & 0xa1;
+                return if i2c_smbus_read_byte_data($file, 0x30) & 0x1f;
+                return if i2c_smbus_read_byte_data($file, 0x33) & 0x3f;
+        }
 
         return 6;