Changeset 5407

Timestamp:

11/24/08 13:42:00 (4 years ago)

Author:

khali

Message:

Get I2C adapter driver names from sysfs. The old method (matching against
regexp for known I2C adapters) is still used as a fallback, as early 2.6
kernels don't support the new method, and some drivers (i2c-viapro for
example) do not bind to their device so the new method doesn't work for
them.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

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

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

@@ -18 +18 @@
                   Handle special case chips more efficiently
                   Fix SMBus detection of W83627EHF and W83627DHG
+                  Get I2C adapter driver names from sysfs (#2328)
 
 3.0.3 (2008-09-28)

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

@@ -2367 +2367 @@
                     || sysfs_device_attribute("${class_dir}/i2c-$1/device", "name");
     next if $entry->{'name'} eq "ISA main adapter";
-    $entry->{'driver'} = find_adapter_driver($entry->{'name'});
+
+    # First try to get the I2C adapter driver name from sysfs, and if it
+    # fails, fall back to searching our list of known I2C adapters.
+    $entry->{'driver'} = sysfs_device_driver("${class_dir}/i2c-$1/device")
+                      || find_adapter_driver($entry->{'name'});
     $i2c_adapters[$1] = $entry;
   }