Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da0383f0 authored by Frank Crawford's avatar Frank Crawford Committed by Greg Kroah-Hartman
Browse files

hwmon (it87): Fix voltage scaling for chips with 10.9mV ADCs 



[ Upstream commit 968b66ffeb7956acc72836a7797aeb7b2444ec51 ]

Fix voltage scaling for chips that have 10.9mV ADCs, where scaling was
not performed.

Fixes: ead80803 ("hwmon: (it87) Add support for IT8732F")
Signed-off-by: default avatarFrank Crawford <frank@crawford.emu.id.au>
Link: https://lore.kernel.org/r/20230318080543.1226700-2-frank@crawford.emu.id.au


[groeck: Update subject and description to focus on bug fix]
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 13493ad6

drivers/hwmon/it87.c

+3 −1
Original line number Diff line number Diff line
@@ -486,6 +486,8 @@ static const struct it87_devices it87_devices[] = { 
#define has_pwm_freq2(data)	((data)->features & FEAT_PWM_FREQ2)

#define has_six_temp(data)	((data)->features & FEAT_SIX_TEMP)

#define has_vin3_5v(data)	((data)->features & FEAT_VIN3_5V)

#define has_scaling(data)	((data)->features & (FEAT_12MV_ADC | \

						     FEAT_10_9MV_ADC))



struct it87_sio_data {

	int sioaddr;
@@ -3098,7 +3100,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))