]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.1-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 20 Jun 2025 10:44:26 +0000 (12:44 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 20 Jun 2025 10:44:26 +0000 (12:44 +0200)
added patches:
iio-adc-ad7606_spi-fix-reg-write-value-mask.patch
iio-imu-inv_icm42600-fix-temperature-calculation.patch

queue-6.1/iio-adc-ad7606_spi-fix-reg-write-value-mask.patch [new file with mode: 0644]
queue-6.1/iio-imu-inv_icm42600-fix-temperature-calculation.patch [new file with mode: 0644]
queue-6.1/series

diff --git a/queue-6.1/iio-adc-ad7606_spi-fix-reg-write-value-mask.patch b/queue-6.1/iio-adc-ad7606_spi-fix-reg-write-value-mask.patch
new file mode 100644 (file)
index 0000000..b9bb7e6
--- /dev/null
@@ -0,0 +1,35 @@
+From 89944d88f8795c6c89b9514cb365998145511cd4 Mon Sep 17 00:00:00 2001
+From: David Lechner <dlechner@baylibre.com>
+Date: Mon, 28 Apr 2025 20:55:34 -0500
+Subject: iio: adc: ad7606_spi: fix reg write value mask
+
+From: David Lechner <dlechner@baylibre.com>
+
+commit 89944d88f8795c6c89b9514cb365998145511cd4 upstream.
+
+Fix incorrect value mask for register write. Register values are 8-bit,
+not 9. If this function was called with a value > 0xFF and an even addr,
+it would cause writing to the next register.
+
+Fixes: f2a22e1e172f ("iio: adc: ad7606: Add support for software mode for ad7616")
+Signed-off-by: David Lechner <dlechner@baylibre.com>
+Reviewed-by: Angelo Dureghello <adureghello@baylibre.com>
+Link: https://patch.msgid.link/20250428-iio-adc-ad7606_spi-fix-write-value-mask-v1-1-a2d5e85a809f@baylibre.com
+Cc: <Stable@vger.kernel.org>
+Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/iio/adc/ad7606_spi.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/iio/adc/ad7606_spi.c
++++ b/drivers/iio/adc/ad7606_spi.c
+@@ -151,7 +151,7 @@ static int ad7606_spi_reg_write(struct a
+       struct spi_device *spi = to_spi_device(st->dev);
+       st->d16[0] = cpu_to_be16((st->bops->rd_wr_cmd(addr, 1) << 8) |
+-                                (val & 0x1FF));
++                                (val & 0xFF));
+       return spi_write(spi, &st->d16[0], sizeof(st->d16[0]));
+ }
diff --git a/queue-6.1/iio-imu-inv_icm42600-fix-temperature-calculation.patch b/queue-6.1/iio-imu-inv_icm42600-fix-temperature-calculation.patch
new file mode 100644 (file)
index 0000000..f747569
--- /dev/null
@@ -0,0 +1,49 @@
+From e2f820014239df9360064079ae93f838ff3b7f8c Mon Sep 17 00:00:00 2001
+From: Sean Nyekjaer <sean@geanix.com>
+Date: Fri, 2 May 2025 11:37:26 +0200
+Subject: iio: imu: inv_icm42600: Fix temperature calculation
+
+From: Sean Nyekjaer <sean@geanix.com>
+
+commit e2f820014239df9360064079ae93f838ff3b7f8c upstream.
+
+>From the documentation:
+"offset to be added to <type>[Y]_raw prior toscaling by <type>[Y]_scale"
+Offset should be applied before multiplying scale, so divide offset by
+scale to make this correct.
+
+Fixes: bc3eb0207fb5 ("iio: imu: inv_icm42600: add temperature sensor support")
+Signed-off-by: Sean Nyekjaer <sean@geanix.com>
+Acked-by: Jean-Baptiste Maneyrol <jean-baptiste.maneyrol@tdk.com>
+Link: https://patch.msgid.link/20250502-imu-v1-1-129b8391a4e3@geanix.com
+Cc: <Stable@vger.kernel.org>
+Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c |    8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c
++++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c
+@@ -67,16 +67,18 @@ int inv_icm42600_temp_read_raw(struct ii
+               return IIO_VAL_INT;
+       /*
+        * T°C = (temp / 132.48) + 25
+-       * Tm°C = 1000 * ((temp * 100 / 13248) + 25)
++       * Tm°C = 1000 * ((temp / 132.48) + 25)
++       * Tm°C = 7.548309 * temp + 25000
++       * Tm°C = (temp + 3312) * 7.548309
+        * scale: 100000 / 13248 ~= 7.548309
+-       * offset: 25000
++       * offset: 3312
+        */
+       case IIO_CHAN_INFO_SCALE:
+               *val = 7;
+               *val2 = 548309;
+               return IIO_VAL_INT_PLUS_MICRO;
+       case IIO_CHAN_INFO_OFFSET:
+-              *val = 25000;
++              *val = 3312;
+               return IIO_VAL_INT;
+       default:
+               return -EINVAL;
index fbda656ada27c15b3560318ff3928ac207a44ea4..95383a417f73d04aa5ededd7573e3d2a735aca44 100644 (file)
@@ -369,3 +369,5 @@ pci-add-acs-quirk-for-loongson-pcie.patch
 pci-fix-lock-symmetry-in-pci_slot_unlock.patch
 pci-dw-rockchip-fix-phy-function-call-sequence-in-rockchip_pcie_phy_deinit.patch
 iio-accel-fxls8962af-fix-temperature-scan-element-sign.patch
+iio-imu-inv_icm42600-fix-temperature-calculation.patch
+iio-adc-ad7606_spi-fix-reg-write-value-mask.patch