Changeset 2787 for lm-sensors/trunk/prog/detect/sensors-detect

Timestamp:

12/06/04 21:18:35 (9 years ago)

Author:

khali

Message:

Fix W83792D detection. Add W83791SD detection.

Files:

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

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

@@ -853 +853 @@
             m5879_detect pca9540_detect smartbatt_mgr_detect
             smartbatt_chgr_detect adt7467_detect lm92_detect max1619_detect
-            lm93_detect lm77_detect lm63_detect pca9556_detect);
+            lm93_detect lm77_detect lm63_detect pca9556_detect
+            w83791sd_detect);
 
 # This is a list of all recognized chips. 
@@ -859 +860 @@
 #  name: The full chip name
 #  driver: The driver name (without .o extension). Put in exactly
-#      "to-be-written" if it is not yet available.
+#      "to-be-written" if it is not yet available. Put in exactly
+#      "not-a-sensor" if it is not a hardware monitoring chip and
+#      there is no known driver for it.
 #  i2c_addrs (optional): For I2C chips, the range of valid I2C addresses to
 #      probe. Recommend avoiding 0x69 because of clock chips.
@@ -1001 +1004 @@
        i2c_addrs => [0x2c..0x2f],
        i2c_detect => sub { w83781d_detect 8, @_},
+     },
+     {
+       name => "Winbond W83791SD",
+       driver => "not-a-sensor",
+       i2c_addrs => [0x2c..0x2f],
+       i2c_detect => sub { w83791sd_detect @_ },
      },
      {
@@ -3397 +3406 @@
   return if $chip == 6 and  $reg1 != 0x31;
   return if $chip == 7 and  $reg1 != 0x71;
-  return if $chip == 8 and  $reg1 != 0x72;
+  return if $chip == 7 and  $reg1 != 0x7a;
   $reg1 = i2c_smbus_read_byte_data($file,0x4a);
   @res = (8);
@@ -3405 +3414 @@
   push @res, (($reg1 & 0x70) >> 4) + 0x48 unless ($reg1 & 0x80 or $chip == 2);
   return @res;
+}
+
+# $_[0]: A reference to the file descriptor to access this chip.
+#        We assume an i2c_set_slave_addr was already done.
+# $_[1]: Address
+# Returns: undef if not detected, 3 if detected
+# Registers used:
+#   0x48: Full I2C Address
+#   0x4e: Vendor ID byte selection
+#   0x4f: Vendor ID
+#   0x58: Device ID
+# Note that the datasheet was useless and this detection routine
+# is based on dumps we received from users. Also, the W83781SD is *NOT*
+# a hardware monitoring chip as far as we know, but we still want to
+# detect it so that people won't keep reporting it as an unknown chip
+# we should investigate about.
+sub w83791sd_detect
+{
+  my ($file, $addr) = @_;
+  my ($reg1, $reg2);
+
+  return unless (i2c_smbus_read_byte_data($file, 0x48) == $addr);
+
+  $reg1 = i2c_smbus_read_byte_data($file, 0x4e);
+  $reg2 = i2c_smbus_read_byte_data($file, 0x4f);
+  return unless (!($reg1 & 0x80) && $reg2 == 0xa3)
+             || (($reg1 & 0x80) && $reg2 == 0x5c);
+
+  $reg1 = i2c_smbus_read_byte_data($file, 0x58);
+  return unless $reg1 == 0x72;
+
+  return 3;
 }
 
@@ -4620 +4661 @@
     if ($chip->{driver} eq "to-be-written") {
       $modprobes .= "# no driver for $chip->{detected}[0]{chipname} yet\n";
-    } else {
+    } elsif ($chip->{driver} ne "not-a-sensor") {
       $modprobes .= "modprobe $chip->{driver}\n";
     }