mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-24 09:50:04 +00:00
Code Issues Releases Wiki Activity

hwmon: (nct6775) Enable both AUXTIN and VIN3 on NCT6776

Browse source 
Per datasheet, VIN3 and AUXTIN share the same external pin. However, there
is no clean way to detect this condition. Furthermore, both are reported
by the BIOS on Supermicro C7H61. It may thus be possible that chip revisions
exist where both attributes are supported at the same time.
Better play safe and report both.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2013-04-05 23:15:53 -07:00
parent debe597cca
commit 573728c647
1 changed files with 0 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
drivers/hwmon/nct6775.c
View file

@ -3721,43 +3721,6 @@ static int nct6775_probe(struct platform_device *pdev)
}
#endif /* USE_ALTERNATE */
switch (data->kind) {
case nct6775:
break;
case nct6776:
/*
* On NCT6776, AUXTIN and VIN3 pins are shared.
* Only way to detect it is to check if AUXTIN is used
* as a temperature source, and if that source is
* enabled.
*
* If that is the case, disable in6, which reports VIN3.
* Otherwise disable temp3.
*/
if (data->have_temp & (1 << 2)) {
u8 reg = nct6775_read_value(data,
data->reg_temp_config[2]);
if (reg & 0x01)
data->have_temp &= ~(1 << 2);
else
data->have_in &= ~(1 << 6);
}
break;
case nct6779:
/*
* Shared pins:
* VIN4 / AUXTIN0
* VIN5 / AUXTIN1
* VIN6 / AUXTIN2
* VIN7 / AUXTIN3
*
* There does not seem to be a clean way to detect if VINx or
* AUXTINx is active, so for keep both sensor types enabled
* for now.
*/
break;
}
/* Initialize the chip */
nct6775_init_device(data);