This is a note to let you know that I've just added the patch titled
iio: imu: fxos8700: fix swapped ACCEL and MAGN channels readback
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
iio-imu-fxos8700-fix-swapped-accel-and-magn-channels-readback.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From c68b44bc7d9b1469774a1c985ee71d2cbc5ebef5 Mon Sep 17 00:00:00 2001
From: Carlos Song <carlos.song@xxxxxxx>
Date: Thu, 8 Dec 2022 15:19:06 +0800
Subject: iio: imu: fxos8700: fix swapped ACCEL and MAGN channels readback
From: Carlos Song <carlos.song@xxxxxxx>
commit c68b44bc7d9b1469774a1c985ee71d2cbc5ebef5 upstream.
Because ACCEL and MAGN channels data register base address is
swapped the accelerometer and magnetometer channels readback is
swapped.
Fixes: 84e5ddd5c46e ("iio: imu: Add support for the FXOS8700 IMU")
Signed-off-by: Carlos Song <carlos.song@xxxxxxx>
Link: https://lore.kernel.org/r/20221208071911.2405922-3-carlos.song@xxxxxxx
Cc: <Stable@xxxxxxxxxxxxxxx>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/iio/imu/fxos8700_core.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
--- a/drivers/iio/imu/fxos8700_core.c
+++ b/drivers/iio/imu/fxos8700_core.c
@@ -420,9 +420,22 @@ static int fxos8700_get_data(struct fxos
u8 base, reg;
s16 tmp;
int ret;
- enum fxos8700_sensor type = fxos8700_to_sensor(chan_type);
- base = type ? FXOS8700_OUT_X_MSB : FXOS8700_M_OUT_X_MSB;
+ /*
+ * Different register base addresses varies with channel types.
+ * This bug hasn't been noticed before because using an enum is
+ * really hard to read. Use an a switch statement to take over that.
+ */
+ switch (chan_type) {
+ case IIO_ACCEL:
+ base = FXOS8700_OUT_X_MSB;
+ break;
+ case IIO_MAGN:
+ base = FXOS8700_M_OUT_X_MSB;
+ break;
+ default:
+ return -EINVAL;
+ }
/* Block read 6 bytes of device output registers to avoid data loss */
ret = regmap_bulk_read(data->regmap, base, data->buf,
Patches currently in stable-queue which might be from carlos.song@xxxxxxx are
queue-5.10/iio-imu-fxos8700-fix-map-label-of-channel-type-to-magn-sensor.patch
queue-5.10/iio-imu-fxos8700-fix-incomplete-accel-and-magn-channels-readback.patch
queue-5.10/iio-imu-fxos8700-fix-failed-initialization-odr-mode-assignment.patch
queue-5.10/iio-imu-fxos8700-remove-definition-fxos8700_ctrl_odr_min.patch
queue-5.10/iio-imu-fxos8700-fix-imu-data-bits-returned-to-user-space.patch
queue-5.10/iio-imu-fxos8700-fix-incorrect-odr-mode-readback.patch
queue-5.10/iio-imu-fxos8700-fix-accel-measurement-range-selection.patch
queue-5.10/iio-imu-fxos8700-fix-swapped-accel-and-magn-channels-readback.patch
queue-5.10/iio-imu-fxos8700-fix-magn-sensor-scale-and-unit.patch
