Changeset 5423

Timestamp:

11/24/08 17:59:25 (4 years ago)

Author:

khali

Message:

Merge both GL518 entries into one. We don't need separate entries as
both revisions are handled by the same driver anyway.

Files:

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

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

@@ -813 +813 @@
      },
      {
-       name => "Genesys Logic GL518SM Revision 0x00",
+       name => "Genesys Logic GL518SM",
        driver => "gl518sm",
        i2c_addrs => [0x2c, 0x2d],
-       i2c_detect => sub { gl518sm_detect(@_, 0); },
-     },
-     {
-       name => "Genesys Logic GL518SM Revision 0x80",
-       driver => "gl518sm",
-       i2c_addrs => [0x2c, 0x2d],
-       i2c_detect => sub { gl518sm_detect(@_, 1); },
+       i2c_detect => sub { gl518sm_detect(@_); },
      },
      {
@@ -4367 +4361 @@
 }
 
-# Chip to detect: 0 = Revision 0x00, 1 = Revision 0x80
 # Registers used:
 #   0x00: Device ID
@@ -4375 +4368 @@
 sub gl518sm_detect
 {
-  my ($file, $addr, $chip) = @_;
+  my ($file, $addr) = @_;
   my $reg;
   return unless i2c_smbus_read_byte_data($file, 0x00) == 0x80;
   return unless (i2c_smbus_read_byte_data($file, 0x03) & 0x80) == 0x00;
   $reg = i2c_smbus_read_byte_data($file, 0x01);
-  return unless ($chip == 0 and $reg == 0x00) or
-                ($chip == 1 and $reg == 0x80);
+  return unless $reg == 0x00 or $reg == 0x80;
   return (6);
 }