aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/nct6775.c
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2013-04-06 02:15:53 -0400
committerGuenter Roeck <linux@roeck-us.net>2013-04-08 00:16:42 -0400
commit573728c647fb991ec7be6408a4975413d2ace6c3 (patch)
tree3525792d4620a016a88b231eefbae45dbafb1b36 /drivers/hwmon/nct6775.c
parentdebe597cca61aacf9e17a4dc155aa84446ab4bf0 (diff)
hwmon: (nct6775) Enable both AUXTIN and VIN3 on NCT6776
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>
Diffstat (limited to 'drivers/hwmon/nct6775.c')
-rw-r--r--drivers/hwmon/nct6775.c37
1 files changed, 0 insertions, 37 deletions
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
index d05a700b7daf..8d0e4c47cca5 100644
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775.c
@@ -3721,43 +3721,6 @@ static int nct6775_probe(struct platform_device *pdev)
3721 } 3721 }
3722#endif /* USE_ALTERNATE */ 3722#endif /* USE_ALTERNATE */
3723 3723
3724 switch (data->kind) {
3725 case nct6775:
3726 break;
3727 case nct6776:
3728 /*
3729 * On NCT6776, AUXTIN and VIN3 pins are shared.
3730 * Only way to detect it is to check if AUXTIN is used
3731 * as a temperature source, and if that source is
3732 * enabled.
3733 *
3734 * If that is the case, disable in6, which reports VIN3.
3735 * Otherwise disable temp3.
3736 */
3737 if (data->have_temp & (1 << 2)) {
3738 u8 reg = nct6775_read_value(data,
3739 data->reg_temp_config[2]);
3740 if (reg & 0x01)
3741 data->have_temp &= ~(1 << 2);
3742 else
3743 data->have_in &= ~(1 << 6);
3744 }
3745 break;
3746 case nct6779:
3747 /*
3748 * Shared pins:
3749 * VIN4 / AUXTIN0
3750 * VIN5 / AUXTIN1
3751 * VIN6 / AUXTIN2
3752 * VIN7 / AUXTIN3
3753 *
3754 * There does not seem to be a clean way to detect if VINx or
3755 * AUXTINx is active, so for keep both sensor types enabled
3756 * for now.
3757 */
3758 break;
3759 }
3760
3761 /* Initialize the chip */ 3724 /* Initialize the chip */
3762 nct6775_init_device(data); 3725 nct6775_init_device(data);
3763 3726