iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hwmon: (w83627ehf) Fix temp2 source for W83627UHG

Browse Source 
Properly set the source of temp2 for the W83627UHG. Also fix a
comment right before that, and document the W83627UHG as reporting up
to 3 temperatures.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: stable@vger.kernel.org
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
This commit is contained in:
Jean Delvare 2012-03-13 04:03:27 -04:00 committed by Guenter Roeck
parent 32260d9440
commit aacb6b0052
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/hwmon/w83627ehf
View File

@ -50,7 +50,7 @@ W83627DHG, W83627DHG-P, W83627UHG, W83667HG, W83667HG-B, W83667HG-I
(NCT6775F), and NCT6776F super I/O chips. We will refer to them collectively (NCT6775F), and NCT6776F super I/O chips. We will refer to them collectively
as Winbond chips. as Winbond chips.
The chips implement 2 to 4 temperature sensors (9 for NCT6775F and NCT6776F), The chips implement 3 to 4 temperature sensors (9 for NCT6775F and NCT6776F),
2 to 5 fan rotation speed sensors, 8 to 10 analog voltage sensors, one VID 2 to 5 fan rotation speed sensors, 8 to 10 analog voltage sensors, one VID
(except for 627UHG), alarms with beep warnings (control unimplemented), (except for 627UHG), alarms with beep warnings (control unimplemented),
and some automatic fan regulation strategies (plus manual fan control mode). and some automatic fan regulation strategies (plus manual fan control mode).

8
drivers/hwmon/w83627ehf.c
View File

@ -39,7 +39,7 @@
0x8860 0xa1 0x8860 0xa1
w83627dhg 9 5 4 3 0xa020 0xc1 0x5ca3 w83627dhg 9 5 4 3 0xa020 0xc1 0x5ca3
w83627dhg-p 9 5 4 3 0xb070 0xc1 0x5ca3 w83627dhg-p 9 5 4 3 0xb070 0xc1 0x5ca3
w83627uhg 8 2 2 2 0xa230 0xc1 0x5ca3 w83627uhg 8 2 2 3 0xa230 0xc1 0x5ca3
w83667hg 9 5 3 3 0xa510 0xc1 0x5ca3 w83667hg 9 5 3 3 0xa510 0xc1 0x5ca3
w83667hg-b 9 5 3 4 0xb350 0xc1 0x5ca3 w83667hg-b 9 5 3 4 0xb350 0xc1 0x5ca3
nct6775f 9 4 3 9 0xb470 0xc1 0x5ca3 nct6775f 9 4 3 9 0xb470 0xc1 0x5ca3
@ -2158,16 +2158,16 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
w83627ehf_set_temp_reg_ehf(data, 3); w83627ehf_set_temp_reg_ehf(data, 3);
/* /*
* Temperature sources for temp1 and temp2 are selected with * Temperature sources for temp2 and temp3 are selected with
* bank 0, registers 0x49 and 0x4a. * bank 0, registers 0x49 and 0x4a.
*/ */
data->temp_src[0] = 0; /* SYSTIN */ data->temp_src[0] = 0; /* SYSTIN */
reg = w83627ehf_read_value(data, 0x49) & 0x07; reg = w83627ehf_read_value(data, 0x49) & 0x07;
/* Adjust to have the same mapping as other source registers */ /* Adjust to have the same mapping as other source registers */
if (reg == 0) if (reg == 0)
data->temp_src[1]++; data->temp_src[1] = 1;
else if (reg >= 2 && reg <= 5) else if (reg >= 2 && reg <= 5)
data->temp_src[1] += 2; data->temp_src[1] = reg + 2;
else /* should never happen */ else /* should never happen */
data->have_temp &= ~(1 << 1); data->have_temp &= ~(1 << 1);
reg = w83627ehf_read_value(data, 0x4a); reg = w83627ehf_read_value(data, 0x4a);