Changeset 5264

Timestamp:

05/25/08 12:07:25 (6 months ago)

Author:

khali

Message:

Improve MAX6657, MAX6658, MAX6659 detection.
Adjust the confidence value of ADM1032, MAX6680/MAX6681 and TMP401.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/CHANGES (modified) (1 diff)
• lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect (modified) (6 diffs)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -5 +5 @@
-  sensors-detect: Add Intel SCH (bus) support
-                  Add SMSC EMC6D103 support
+                  Improve MAX6657, MAX6658, MAX6659 detection
-
-3.0.2 (2008-05-18)

lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect

@@ -1095 +1095 @@
-       driver => "lm90",
-       i2c_addrs => [0x4c],
-lm90_detect(4, 
+max6657_detect(
-     },
-     {
@@ -1101 +1101 @@
-       driver => "lm90",
-       i2c_addrs => [0x4d..0x4e], # 0x4c is handled above
-lm90_detect(4, 
+max6657_detect(
-     },
-     {
@@ -3959 +3959 @@
-
-# $_[0]: Chip to detect
-=LM89/LM99, 2=LM86, 3=ADM1032, 4=MAX6657/MAX6658/MAX6659
+ = LM89/LM99, 2 = LM86, 3 = ADM1032
-#    5 = ADT7461, 6 = MAX6648/MAX6692, 7 = MAX6680/MAX6681,
-), 9 = TI TMP401
+, 9 = TI TMP401)
-# $_[1]: A reference to the file descriptor to access this chip.
-# $_[2]: Address
-
-
-
+
-# Registers used:
-#   0x03: Configuration
@@ -4006 +4004 @@
-    return if $rate > 0x0a;
-    return if $mid != 0x41;     # Analog Devices
-
-
-
-
-
-
-
-
-
+
-  }
-  if ($chip == 5) {
@@ -4034 +4024 @@
-    return if $mid != 0x4d;     # Maxim
-    return if $cid != 0x01;     # MAX6680/MAX6681
-6
+8
-  }
-  if ($chip == 8) {
@@ -4048 +4038 @@
-    return if $mid != 0x55;     # Texas Instruments
-    return if $cid != 0x11;     # TMP401
-6
+8
-  }
-  return;
+}
+
+# $_[0]: A reference to the file descriptor to access this chip.
+# $_[1]: Address
+# Returns: undef if not detected, 5 if detected.
+# Registers used:
+#   0x03: Configuration (no low nibble)
+#   0x04: Conversion rate
+#   0xfe: Manufacturer ID
+#   0xff: no register
+sub max6657_detect
+{
+  my ($file, $addr) = @_;
+  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 $mid != 0x4d;     # Maxim
+  return if ($conf & 0x1f) != 0x0d; # No low nibble,
+                                    # returns previous low nibble
+  return if $cid != 0x4d;     # No register, returns previous value
+
+  my $rate = i2c_smbus_read_byte_data($file, 0x04);
+  return if $rate > 0x09;
+
+  $cid = i2c_smbus_read_byte_data($file, 0xff);
+  $conf = i2c_smbus_read_byte_data($file, 0x03);
+  return if ($conf & 0x0f) != $rate; # No low nibble,
+                                     # returns previous low nibble
+  return if $cid != $rate;    # No register, returns previous value
+
+  return 5;
-}
-