Commit 539ad001 authored Sep 18, 2019 by amy.shih Committed by Guenter Roeck Oct 02, 2019

hwmon: (nct7904) Fix the incorrect value of vsen_mask in nct7904_data struct



Voltage sensors overlap with external temperature sensors. Detect
the multi-function of voltage, thermal diode and thermistor from
register VT_ADC_MD_REG to set value of vsen_mask in nct7904_data
struct.

Signed-off-by: amy.shih <amy.shih@advantech.com.tw>
Link: https://lore.kernel.org/r/20190918084801.9859-1-Amy.Shih@advantech.com.tw


Signed-off-by: Guenter Roeck <linux@roeck-us.net>

parent 54ecb8f7

drivers/hwmon/nct7904.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -915,12 +915,15 @@ static int nct7904_probe(struct i2c_client *client,

		data->temp_mode = 0;
		for (i = 0; i < 4; i++) {
		val = (ret & (0x03 << i)) >> (i * 2);
		val = (ret >> (i * 2)) & 0x03;
		bit = (1 << i);
		if (val == 0)
		if (val == 0) {
		data->tcpu_mask &= ~bit;
		else if (val == 0x1 \|\| val == 0x2)
		} else {
		if (val == 0x1 \|\| val == 0x2)
		data->temp_mode \|= bit;
		data->vsen_mask &= ~(0x06 << (i * 2));
		}
		}

		/* PECI */

Admin message