Generalise scaling to include all recent ADC values and match the labels
for internal voltage sensor to match.
This includes correction of an existing error for voltage scaling for
chips that have 10.9mV ADCs, where scaling was not performed.
Signed-off-by: Frank Crawford <frank@xxxxxxxxxxxxxxxxxx>
---
drivers/hwmon/it87.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index fe1291d5be4b..ca4b79839d98 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -517,6 +517,9 @@ static const struct it87_devices it87_devices[] = {
#define has_vin3_5v(data) ((data)->features & FEAT_VIN3_5V)
#define has_conf_noexit(data) ((data)->features & FEAT_CONF_NOEXIT)
#define has_11mv_adc(data) ((data)->features & FEAT_11MV_ADC)
+#define has_scaling(data) ((data)->features & (FEAT_12MV_ADC | \
+ FEAT_10_9MV_ADC | \
+ FEAT_11MV_ADC))
struct it87_sio_data {
int sioaddr;
@@ -2006,8 +2009,7 @@ static ssize_t show_label(struct device *dev, struct device_attribute *attr,
if (has_vin3_5v(data) && nr == 0)
label = labels[0];
- else if (has_12mv_adc(data) || has_10_9mv_adc(data) ||
- has_11mv_adc(data))
+ else if (has_scaling(data))
label = labels_it8721[nr];
else
label = labels[nr];
@@ -3139,7 +3141,7 @@ static int it87_probe(struct platform_device *pdev)
"Detected broken BIOS defaults, disabling PWM interface\n");
/* Starting with IT8721F, we handle scaling of internal voltages */
- if (has_12mv_adc(data)) {
+ if (has_scaling(data)) {
if (sio_data->internal & BIT(0))
data->in_scaled |= BIT(3); /* in3 is AVCC */
if (sio_data->internal & BIT(1))
--
2.39.2
