Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

hwmon: (nct7904) Fix the incorrect value of vsen_mask & tcpu_mask & temp_mode in nct7904_data struct.

Voltage sensors overlap with external temperature sensors. Detect
the multi-function of voltage, thermal diode, thermistor and
reserved from register VT_ADC_MD_REG to set value of vsen_mask &
tcpu_mask & temp_mode in nct7904_data struct. If the value is
reserved, needs to disable the vsen_mask & tcpu_mask.

Signed-off-by: amy.shih <amy.shih@advantech.com.tw>
Link: https://lore.kernel.org/r/20191014082451.2895-1-Amy.Shih@advantech.com.tw
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

authored by

amy.shih and committed by
Guenter Roeck
6fc28b7e 4f5cafb5

+12 -3
+12 -3
drivers/hwmon/nct7904.c
··· 82 #define FANCTL1_FMR_REG 0x00 /* Bank 3; 1 reg per channel */ 83 #define FANCTL1_OUT_REG 0x10 /* Bank 3; 1 reg per channel */ 84 85 #define ENABLE_TSI BIT(1) 86 87 static const unsigned short normal_i2c[] = { ··· 939 for (i = 0; i < 4; i++) { 940 val = (ret >> (i * 2)) & 0x03; 941 bit = (1 << i); 942 - if (val == 0) { 943 data->tcpu_mask &= ~bit; 944 } else { 945 - if (val == 0x1 || val == 0x2) 946 - data->temp_mode |= bit; 947 data->vsen_mask &= ~(0x06 << (i * 2)); 948 } 949 }
··· 82 #define FANCTL1_FMR_REG 0x00 /* Bank 3; 1 reg per channel */ 83 #define FANCTL1_OUT_REG 0x10 /* Bank 3; 1 reg per channel */ 84 85 + #define VOLT_MONITOR_MODE 0x0 86 + #define THERMAL_DIODE_MODE 0x1 87 + #define THERMISTOR_MODE 0x3 88 + 89 #define ENABLE_TSI BIT(1) 90 91 static const unsigned short normal_i2c[] = { ··· 935 for (i = 0; i < 4; i++) { 936 val = (ret >> (i * 2)) & 0x03; 937 bit = (1 << i); 938 + if (val == VOLT_MONITOR_MODE) { 939 data->tcpu_mask &= ~bit; 940 + } else if (val == THERMAL_DIODE_MODE && i < 2) { 941 + data->temp_mode |= bit; 942 + data->vsen_mask &= ~(0x06 << (i * 2)); 943 + } else if (val == THERMISTOR_MODE) { 944 + data->vsen_mask &= ~(0x02 << (i * 2)); 945 } else { 946 + /* Reserved */ 947 + data->tcpu_mask &= ~bit; 948 data->vsen_mask &= ~(0x06 << (i * 2)); 949 } 950 }