From 1fa1a00217a3d08a324e91f98941d960fd4115e5 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 26 Mar 2023 21:40:38 -0400 Subject: [PATCH] Fixes for 5.4 Signed-off-by: Sasha Levin --- ...oltage-scaling-for-chips-with-10.9mv.patch | 47 +++++++++++++++++++ queue-5.4/series | 1 + 2 files changed, 48 insertions(+) create mode 100644 queue-5.4/hwmon-it87-fix-voltage-scaling-for-chips-with-10.9mv.patch diff --git a/queue-5.4/hwmon-it87-fix-voltage-scaling-for-chips-with-10.9mv.patch b/queue-5.4/hwmon-it87-fix-voltage-scaling-for-chips-with-10.9mv.patch new file mode 100644 index 00000000000..9ceffd10790 --- /dev/null +++ b/queue-5.4/hwmon-it87-fix-voltage-scaling-for-chips-with-10.9mv.patch @@ -0,0 +1,47 @@ +From a46c22e0cf782e56b979ab52c263902e64d876d3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 18 Mar 2023 19:05:42 +1100 +Subject: hwmon (it87): Fix voltage scaling for chips with 10.9mV ADCs + +From: Frank Crawford + +[ Upstream commit 968b66ffeb7956acc72836a7797aeb7b2444ec51 ] + +Fix voltage scaling for chips that have 10.9mV ADCs, where scaling was +not performed. + +Fixes: ead8080351c9 ("hwmon: (it87) Add support for IT8732F") +Signed-off-by: Frank Crawford +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: Guenter Roeck +Signed-off-by: Sasha Levin +--- + drivers/hwmon/it87.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c +index fac9b5c68a6a0..85413d3dc3940 100644 +--- a/drivers/hwmon/it87.c ++++ b/drivers/hwmon/it87.c +@@ -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)) +-- +2.39.2 + diff --git a/queue-5.4/series b/queue-5.4/series index 1435e58c25c..599939158fd 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -25,3 +25,4 @@ net-mdio-thunder-add-missing-fwnode_handle_put.patch bluetooth-btqcomsmd-fix-command-timeout-after-settin.patch bluetooth-btsdio-fix-use-after-free-bug-in-btsdio_re.patch platform-chrome-cros_ec_chardev-fix-kernel-data-leak.patch +hwmon-it87-fix-voltage-scaling-for-chips-with-10.9mv.patch -- 2.47.3