diff options
| author | khali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0> | 2011-05-12 09:37:57 +0000 |
|---|---|---|
| committer | khali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0> | 2011-05-12 09:37:57 +0000 |
| commit | 413ad14aec04419a55d21ff74ed1d52ff35ce162 (patch) | |
| tree | bfb43a0eb811397a5e5e6a0754ae3ce52ce64a9c | |
| parent | c14b5a5344f3a38b339997e1b8956f229f411b35 (diff) | |
| download | lm-sensors-413ad14aec04419a55d21ff74ed1d52ff35ce162.tar.gz | |
Patch from Steve Glendinning (SMSC):
EMC2300 is already detected, but is reported as EMC6D103S. These
two are register compatible and it's not actually possible to
distinguish between them by registers.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5973 7894878c-1315-0410-8ee3-d5d059ff63e0
| -rw-r--r-- | CHANGES | 1 | ||||
| -rwxr-xr-x | prog/detect/sensors-detect | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -11,6 +11,7 @@ SVN HEAD Drop unreliable smart battery detection Add detection of SMSC EMC6W201 Drop unreliable detection of Maxim MAX6650 + Add detection of SMSC EMC2300 3.3.0 (2011-03-28) Makefile: Check for bison and flex diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect index 96f7e040..c525e699 100755 --- a/prog/detect/sensors-detect +++ b/prog/detect/sensors-detect @@ -557,7 +557,7 @@ use vars qw(@i2c_adapter_names); i2c_addrs => [0x2c..0x2e], i2c_detect => sub { lm85_detect(@_, 6); }, }, { - name => "SMSC EMC6D103S", + name => "SMSC EMC6D103S or EMC2300", driver => "lm85", i2c_addrs => [0x2c..0x2e], i2c_detect => sub { lm85_detect(@_, 8); }, @@ -4857,7 +4857,7 @@ sub andigilog_aSC7511_detect # Chip to detect: 0 = LM85, 1 = LM96000, 2 = ADM1027, 3 = ADT7463, # 4 = EMC6D100/101, 5 = EMC6D102, 6 = EMC6D103, -# 7 = WPCD377I (no sensors), 8 = EMC6D103S +# 7 = WPCD377I (no sensors), 8 = EMC6D103S/EMC2300 # Registers used: # 0x3e: Vendor register # 0x3d: Device ID register (Analog Devices only) @@ -4896,7 +4896,7 @@ sub lm85_detect && $verstep != 0x69; # EMC6D103 A1 } elsif ($chip == 8) { return if $vendor != 0x5c; # SMSC - return if $verstep != 0x6a; # EMC6D103S + return if $verstep != 0x6a; # EMC6D103S/EMC2300 } if ($vendor == 0x41) { # Analog Devices |