Changeset 5494

Timestamp:

12/01/08 18:02:47 (4 years ago)

Author:

khali

Message:

Drop alias detection for Super-I/O chips. It never actually worked,
because the code compares the chip names first and we never cared of
using the exact same name string for I2C and Super-I/O entries of
a given chip. Anyway, we do not have any Super-I/O driver also
doing I2C access so detecting aliases wouldn't be that usesul. And
as I've said before, alias detection is better handled at the kernel
level anyway.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

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

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

@@ -32 +32 @@
                   Fix bus number prediction logic (#2327)
                   Suggest the sbs driver for smart batteries
+                  Drop alias detection for Super-I/O chips
 
 3.0.3 (2008-09-28)

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

@@ -1125 +1125 @@
 #  devid_mask (optional): Bitmask to apply before checking the device ID
 #  logdev: The logical device containing the sensors
-#  alias_detect (optional): For chips which can be both on the LPC and the
-#      I2C bus, a function which detects whether two entries are the same.
-#      The function will be passed three parameters: the LPC address, an
-#      open file descriptor to access the I2C bus, and the I2C address.
 use vars qw(@superio_ids_natsemi @superio_ids_smsc @superio_ids_smsc_ns
             @superio_ids_winbond @superio_ids_ite @superio_ids);
@@ -1450 +1446 @@
                 devid => 0x3c,
                 logdev => 0x0b,
-                alias_detect => sub { vt1211_alias_detect(@_); },
         }, {
                 name => "VIA VT1212 Super IO Lite",     # in 100 pin TQFP package
@@ -1464 +1459 @@
                 devid => 0x52,
                 logdev => 0x0b,
-                alias_detect => sub { winbond_alias_detect(@_, 0x2b, 0x3d); },
         }, {
                 name => "Winbond W83627THF/THG Super IO Sensors",
@@ -1498 +1492 @@
                 devid_mask => 0xFFC0,
                 logdev => 0x0b,
-                alias_detect => sub { winbond_alias_detect(@_, 0x2b, 0x3e); },
         }, {
                 name => "Winbond W83627DHG Super IO Sensors",
@@ -1505 +1498 @@
                 devid_mask => 0xFFF0,
                 logdev => 0x0b,
-                alias_detect => sub { winbond_alias_detect(@_, 0x2b, 0x3e); },
         }, {
                 name => "Winbond W83L517D Super IO",
@@ -1572 +1564 @@
                 devid => 0x8712,
                 logdev => 0x04,
-                alias_detect => sub { winbond_alias_detect(@_, 0x30, 0x45); },
         }, {
                 name => "ITE IT8716F Super IO Sensors",
@@ -2910 +2901 @@
                 chipname => $chip->{name}
         };
-        add_isa_to_chips_detected($chip->{driver}, $new_hash,
-                                  $chip->{alias_detect});
+        add_isa_to_chips_detected($chip->{driver}, $new_hash);
 }
 
@@ -4647 +4637 @@
         for ($i = $first; $i <= $last; $i++) {
                 return 0 unless isa_read_i5d6($isa_addr, $i) ==
-                                i2c_smbus_read_byte_data($file, $i);
-        }
-        return 1;
-}
-
-sub vt1211_alias_detect
-{
-        my ($isa_addr, $file, $i2c_addr) = @_;
-        my $i;
-
-        return 0 unless (inb($isa_addr + 0x48) & 0x7f) == $i2c_addr;
-        for ($i = 0x2b; $i <= 0x3d; $i++) {
-                return 0 unless inb($isa_addr + $i) ==
                                 i2c_smbus_read_byte_data($file, $i);
         }