summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorGuenter Roeck2018-09-18 19:52:55 +0200
committerGuenter Roeck2018-10-11 05:37:13 +0200
commit7dcdbdeb1b45b9071ad986bf20d8c2da6a057eb6 (patch)
tree325541fe71c80e35c7ea859809fe22e54dadfb80 /drivers/hwmon
parenthwmon: (nct6775) Improve instruction grouping (diff)
downloadkernel-qcow2-linux-7dcdbdeb1b45b9071ad986bf20d8c2da6a057eb6.tar.gz
kernel-qcow2-linux-7dcdbdeb1b45b9071ad986bf20d8c2da6a057eb6.tar.xz
kernel-qcow2-linux-7dcdbdeb1b45b9071ad986bf20d8c2da6a057eb6.zip
hwmon: (nct6775) Fix fan6/pwm6 detection for NCT6792D
Per datasheet, AUXFANIN3 (fan6) and AUXFANOUT3 (pwm6) are only connected if DSW_EN is false. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/nct6775.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
index 0ad4bf0ab8be..6e11df697e6e 100644
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775.c
@@ -3522,10 +3522,13 @@ nct6775_check_fan_inputs(struct nct6775_data *data)
switch (data->kind) {
case nct6791:
- case nct6792:
fan6pin = cr2d & BIT(1);
pwm6pin = cr2d & BIT(0);
break;
+ case nct6792:
+ fan6pin = !dsw_en && (cr2d & BIT(1));
+ pwm6pin = !dsw_en && (cr2d & BIT(0));
+ break;
case nct6793:
case nct6795:
case nct6796: