Changeset 5680

Timestamp:

03/11/09 22:44:32 (4 years ago)

Author:

khali

Message:

Differentiate between PC8374L and WPCD377I. Both chips have the same
device ID so we use the revision register to differentiate between
them, using custom detection functions.

Location:

lm-sensors/trunk

Files:

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

lm-sensors/trunk/CHANGES

@@ -5 +5 @@
   sensors-detect: Add nNidia nForce MCP78S SMBus detection
                   Display Super-I/O address even if LD is disabled
+                  Differentiate between PC8374L and WPCD377I
 
 3.1.0 "Happy Birthday Lina" (2009-02-28)

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

@@ -1164 +1164 @@
 #  devid_mask (optional): Bitmask to apply before checking the device ID
 #  logdev: The logical device containing the sensors
+#  check (optional): A function to refine the detection. Will be passed
+#      the index and data ports as parameters. Must return 1 for a matching
+#      device, 0 otherwise.
 #  features (optional): Features supported by this device, amongst:
 #      * FEAT_IN
@@ -1178 +1181 @@
 @superio_ids_natsemi = (
         {
-                name => "Nat. Semi. PC8374L Super IO Sensors",
+                name => "Nat. Semi. PC8374L Super IO Sensors",  # Also Nuvoton WPCD374L
                 driver => "to-be-written",
                 devid => 0xf1,
+                check => sub {
+                        outb($_[0], 0x27);
+                        # Guess work; seen so far: 0x11
+                        return (inb($_[1]) < 0x80);
+                },
                 logdev => 0x08,
                 features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+        }, {
+                name => "Nuvoton WPCD377I Super IO",    # Also WPCD376I
+                driver => "not-a-sensor",
+                devid => 0xf1,
+                check => sub {
+                        outb($_[0], 0x27);
+                        # Guess work; seen so far: 0x91 (twice)
+                        return (inb($_[1]) >= 0x80);
+                },
         }, {
                 name => "Nat. Semi. PC87351 Super IO Fan Sensors",
@@ -3205 +3222 @@
         my ($addrreg, $datareg, $chip) = @_;
         my ($val, $addr);
+
+        if (exists $chip->{check}) {
+                return 0 unless $chip->{check}($addrreg, $datareg);
+        }
 
         printf "\%-60s", "Found `$chip->{name}'";