This is a note to let you know that I've just added the patch titled iio: imu: fxos8700: fix incorrect ODR mode readback to the 6.1-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-incorrect-odr-mode-readback.patch and it can be found in the queue-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 78ad6864e9e012cdba7c353d044d21ffcfd5f34b Mon Sep 17 00:00:00 2001 From: Carlos Song <carlos.song@xxxxxxx> Date: Wed, 18 Jan 2023 15:42:24 +0800 Subject: iio: imu: fxos8700: fix incorrect ODR mode readback From: Carlos Song <carlos.song@xxxxxxx> commit 78ad6864e9e012cdba7c353d044d21ffcfd5f34b upstream. The absence of a correct offset leads an incorrect ODR mode readback after use a hexadecimal number to mark the value from FXOS8700_CTRL_REG1. Get ODR mode by field mask and FIELD_GET clearly and conveniently. And attach other additional fix for keeping the original code logic and a good readability. Fixes: 84e5ddd5c46e ("iio: imu: Add support for the FXOS8700 IMU") Signed-off-by: Carlos Song <carlos.song@xxxxxxx> Link: https://lore.kernel.org/r/20230118074227.1665098-2-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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/drivers/iio/imu/fxos8700_core.c +++ b/drivers/iio/imu/fxos8700_core.c @@ -10,6 +10,7 @@ #include <linux/regmap.h> #include <linux/acpi.h> #include <linux/bitops.h> +#include <linux/bitfield.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> @@ -144,9 +145,9 @@ #define FXOS8700_NVM_DATA_BNK0 0xa7 /* Bit definitions for FXOS8700_CTRL_REG1 */ -#define FXOS8700_CTRL_ODR_MSK 0x38 #define FXOS8700_CTRL_ODR_MAX 0x00 #define FXOS8700_CTRL_ODR_MIN GENMASK(4, 3) +#define FXOS8700_CTRL_ODR_MSK GENMASK(5, 3) /* Bit definitions for FXOS8700_M_CTRL_REG1 */ #define FXOS8700_HMS_MASK GENMASK(1, 0) @@ -508,10 +509,9 @@ static int fxos8700_set_odr(struct fxos8 if (i >= odr_num) return -EINVAL; - return regmap_update_bits(data->regmap, - FXOS8700_CTRL_REG1, - FXOS8700_CTRL_ODR_MSK + FXOS8700_ACTIVE, - fxos8700_odr[i].bits << 3 | active_mode); + val &= ~FXOS8700_CTRL_ODR_MSK; + val |= FIELD_PREP(FXOS8700_CTRL_ODR_MSK, fxos8700_odr[i].bits) | FXOS8700_ACTIVE; + return regmap_write(data->regmap, FXOS8700_CTRL_REG1, val); } static int fxos8700_get_odr(struct fxos8700_data *data, enum fxos8700_sensor t, @@ -524,7 +524,7 @@ static int fxos8700_get_odr(struct fxos8 if (ret) return ret; - val &= FXOS8700_CTRL_ODR_MSK; + val = FIELD_GET(FXOS8700_CTRL_ODR_MSK, val); for (i = 0; i < odr_num; i++) if (val == fxos8700_odr[i].bits) Patches currently in stable-queue which might be from carlos.song@xxxxxxx are queue-6.1/iio-imu-fxos8700-fix-map-label-of-channel-type-to-magn-sensor.patch queue-6.1/iio-imu-fxos8700-fix-incomplete-accel-and-magn-channels-readback.patch queue-6.1/iio-imu-fxos8700-fix-failed-initialization-odr-mode-assignment.patch queue-6.1/iio-imu-fxos8700-remove-definition-fxos8700_ctrl_odr_min.patch queue-6.1/iio-imu-fxos8700-fix-imu-data-bits-returned-to-user-space.patch queue-6.1/iio-imu-fxos8700-fix-incorrect-odr-mode-readback.patch queue-6.1/iio-imu-fxos8700-fix-accel-measurement-range-selection.patch queue-6.1/iio-imu-fxos8700-fix-swapped-accel-and-magn-channels-readback.patch queue-6.1/iio-imu-fxos8700-fix-magn-sensor-scale-and-unit.patch