From: Greg Kroah-Hartman Date: Fri, 20 Jun 2025 10:44:17 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v5.4.295~139 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=308c2cc7789a9744cb11eceac562a927e20267d5;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: iio-adc-ad7606_spi-fix-reg-write-value-mask.patch iio-imu-inv_icm42600-fix-temperature-calculation.patch --- diff --git a/queue-5.15/iio-adc-ad7606_spi-fix-reg-write-value-mask.patch b/queue-5.15/iio-adc-ad7606_spi-fix-reg-write-value-mask.patch new file mode 100644 index 0000000000..b9bb7e6e0c --- /dev/null +++ b/queue-5.15/iio-adc-ad7606_spi-fix-reg-write-value-mask.patch @@ -0,0 +1,35 @@ +From 89944d88f8795c6c89b9514cb365998145511cd4 Mon Sep 17 00:00:00 2001 +From: David Lechner +Date: Mon, 28 Apr 2025 20:55:34 -0500 +Subject: iio: adc: ad7606_spi: fix reg write value mask + +From: David Lechner + +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 +Reviewed-by: Angelo Dureghello +Link: https://patch.msgid.link/20250428-iio-adc-ad7606_spi-fix-write-value-mask-v1-1-a2d5e85a809f@baylibre.com +Cc: +Signed-off-by: Jonathan Cameron +Signed-off-by: Greg Kroah-Hartman +--- + 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-5.15/iio-imu-inv_icm42600-fix-temperature-calculation.patch b/queue-5.15/iio-imu-inv_icm42600-fix-temperature-calculation.patch new file mode 100644 index 0000000000..f7475695dc --- /dev/null +++ b/queue-5.15/iio-imu-inv_icm42600-fix-temperature-calculation.patch @@ -0,0 +1,49 @@ +From e2f820014239df9360064079ae93f838ff3b7f8c Mon Sep 17 00:00:00 2001 +From: Sean Nyekjaer +Date: Fri, 2 May 2025 11:37:26 +0200 +Subject: iio: imu: inv_icm42600: Fix temperature calculation + +From: Sean Nyekjaer + +commit e2f820014239df9360064079ae93f838ff3b7f8c upstream. + +>From the documentation: +"offset to be added to [Y]_raw prior toscaling by [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 +Acked-by: Jean-Baptiste Maneyrol +Link: https://patch.msgid.link/20250502-imu-v1-1-129b8391a4e3@geanix.com +Cc: +Signed-off-by: Jonathan Cameron +Signed-off-by: Greg Kroah-Hartman +--- + 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; diff --git a/queue-5.15/series b/queue-5.15/series index d0ed581f9f..b5f2a7752e 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -256,3 +256,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