Changeset 5929

Timestamp:

02/16/11 14:58:38 (15 months ago)

Author:

khali

Message:

Add support for the at24 kernel driver.

Location:

i2c-tools/trunk

Files:

• CHANGES (modified) (1 diff)
• eeprom/decode-dimms (modified) (2 diffs)

i2c-tools/trunk/CHANGES

@@ -5 +5 @@
   decode-dimms: Decode module configuration type of DDR SDRAM
                 Decode refresh rate of DDR SDRAM
+                Add support for the at24 kernel driver
   i2c-dev.h: Make value arrays const for block write functions
   i2cset: Add support for SMBus and I2C block writes

i2c-tools/trunk/eeprom/decode-dimms

@@ -6 +6 @@
 # modified by Christian Zuckschwerdt <zany@triq.net>
 # modified by Burkart Lingner <burkart@bollchen.de>
-# Copyright (C) 2005-2009  Jean Delvare <khali@linux-fr.org>
+# Copyright (C) 2005-2011  Jean Delvare <khali@linux-fr.org>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -1711 +1711 @@
 
 
+# From a sysfs device path and an attribute name, return the attribute
+# value, or undef (stolen from sensors-detect)
+sub sysfs_device_attribute
+{
+        my ($device, $attr) = @_;
+        my $value;
+
+        open(local *FILE, "$device/$attr") or return "";
+        $value = <FILE>;
+        close(FILE);
+        return unless defined $value;
+
+        chomp($value);
+        return $value;
+}
+
 sub get_dimm_list
 {
-        my ($dir, $file, @files);
+        my (@dirs, $dir, $file, @files);
 
         if ($use_sysfs) {
-                $dir = '/sys/bus/i2c/drivers/eeprom';
+                @dirs = ('/sys/bus/i2c/drivers/eeprom', '/sys/bus/i2c/drivers/at24');
         } else {
-                $dir = '/proc/sys/dev/sensors';
-        }
-
-        if (opendir(local *DIR, $dir)) {
+                @dirs = ('/proc/sys/dev/sensors');
+        }
+
+        foreach $dir (@dirs) {
+                next unless opendir(local *DIR, $dir);
                 while (defined($file = readdir(DIR))) {
-                        next if $use_sysfs && $file !~ /^\d+-[\da-f]+$/i;
-                        next if !$use_sysfs && $file !~ /^eeprom-/;
+                        if ($use_sysfs) {
+                                # We look for I2C devices like 0-0050 or 2-0051
+                                next unless $file =~ /^\d+-[\da-f]+$/i;
+                                next unless -d "$dir/$file";
+
+                                # Device name must be eeprom (driver eeprom)
+                                # or spd (driver at24)
+                                my $attr = sysfs_device_attribute("$dir/$file", "name");
+                                next unless defined $attr &&
+                                            ($attr eq "eeprom" || $attr eq "spd");
+                        } else {
+                                next unless $file =~ /^eeprom-/;
+                        }
                         push @files, { eeprom => "$file",
                                        file => "$dir/$file" };
                 }
                 close(DIR);
+        }
+
+        if (@files) {
                 return sort { $a->{file} cmp $b->{file} } @files;
         } elsif (! -d '/sys/module/eeprom') {