mir/lm-sensors
2
0
Fork 0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-09-02 15:25:38 +00:00
Code Issues Releases Wiki Activity

Improve ADM1029 detection again.

Browse Source 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4268 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare
2006-12-21 17:56:43 +00:00
parent 6af70f2828
commit 4fd6f58ff4
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
prog/detect/sensors-detect
View File

@@ -1258,7 +1258,7 @@ use vars qw(@pci_adapters_sis5595 @pci_adapters_sis645 @pci_adapters_sis96x);
}, },
{ {
name => "Analog Devices ADM1029", name => "Analog Devices ADM1029",
driver => "to-be-written", driver => "adm1029",
i2c_addrs => [0x28..0x2f], i2c_addrs => [0x28..0x2f],
i2c_detect => sub { adm1029_detect(0, @_); }, i2c_detect => sub { adm1029_detect(0, @_); },
}, },
@@ -3718,6 +3718,7 @@ sub lm63_detect
# Returns: undef if not detected, 6 if detected. # Returns: undef if not detected, 6 if detected.
# Registers used: # Registers used:
# 0x02, 0x03: Fan support # 0x02, 0x03: Fan support
# 0x06: Temperature support
# 0x07, 0x08, 0x09: Fan config # 0x07, 0x08, 0x09: Fan config
# 0x0d: Manufacturer ID # 0x0d: Manufacturer ID
# 0x0e: Chip ID / die revision # 0x0e: Chip ID / die revision
@@ -3726,15 +3727,20 @@ sub adm1029_detect
my ($chip, $file, $addr) = @_; my ($chip, $file, $addr) = @_;
my $mid = i2c_smbus_read_byte_data($file, 0x0d); my $mid = i2c_smbus_read_byte_data($file, 0x0d);
my $cid = i2c_smbus_read_byte_data($file, 0x0e); my $cid = i2c_smbus_read_byte_data($file, 0x0e);
my $cfg;
if ($chip == 0) { if ($chip == 0) {
return unless $mid == 0x41; # Analog Devices return unless $mid == 0x41; # Analog Devices
return unless ($cid & 0xF0) == 0x00; # ADM1029 return unless ($cid & 0xF0) == 0x00; # ADM1029
# Extra check on unused bits # Extra check on unused bits
foreach my $reg (0x02, 0x03, 0x07, 0x08, 0x09) { $cfg = i2c_smbus_read_byte_data($file, 0x02);
my $fancfg = i2c_smbus_read_byte_data($file, $reg); return unless $cfg == 0x03;
return unless ($fancfg & 0xFC) == 0x00; $cfg = i2c_smbus_read_byte_data($file, 0x06);
return unless ($cfg & 0xF9) == 0x01;
foreach my $reg (0x03, 0x07, 0x08, 0x09) {
$cfg = i2c_smbus_read_byte_data($file, $reg);
return unless ($cfg & 0xFC) == 0x00;
} }
return 7; return 7;