Skip to contentSkip to conversation

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

PATCH Applied [email protected] 2 participants 2 messages Sep 18, 2019 Hardware monitoring

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 hwmon: (nct7904) Fix the incorrect value of vsen_mask in nct7904_data struct.

From: "amy.shih" <[email protected]>

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.

---
Changes in v3:
- Simplified the bit map.
- Modified the if statement.
Changes in v2:
- Moved the if statement to outside.

 drivers/hwmon/nct7904.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/hwmon/nct7904.c +7 -4
index 95b447cfa24c..f62dd1882451 100644
@@ -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)
-			data->temp_mode |= bit;
+		} else {
+			if (val == 0x1 || val == 0x2)
+				data->temp_mode |= bit;
+			data->vsen_mask &= ~(0x06 << (i * 2));
+		}
 	}
 
 	/* PECI */
Signature · 1 line
2.17.1
maintainer Applied
#1 lore raw
Quoted 8 lines · On Wed, Sep 18, 2019 at 04:48:00PM +0800, [email protected] wrote:

From: "amy.shih" <[email protected]>

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.

Applied.

Thanks,
Guenter

Quoted 34 lines

---
Changes in v3:
- Simplified the bit map.
- Modified the if statement.
Changes in v2:
- Moved the if statement to outside.

 drivers/hwmon/nct7904.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/hwmon/nct7904.c +7 -4
index 95b447cfa24c..f62dd1882451 100644
@@ -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)
-			data->temp_mode |= bit;
+		} else {
+			if (val == 0x1 || val == 0x2)
+				data->temp_mode |= bit;
+			data->vsen_mask &= ~(0x06 << (i * 2));
+		}
 	}
 
 	/* PECI */