This is a note to let you know that I've just added the patch titled
iio: imu: fxos8700: fix failed initialization ODR mode assignment
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-failed-initialization-odr-mode-assignment.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 eb6d8f8705bc19141bac81d8161461f9e256948a Mon Sep 17 00:00:00 2001
From: Carlos Song <carlos.song@xxxxxxx>
Date: Wed, 18 Jan 2023 15:42:25 +0800
Subject: iio: imu: fxos8700: fix failed initialization ODR mode assignment
From: Carlos Song <carlos.song@xxxxxxx>
commit eb6d8f8705bc19141bac81d8161461f9e256948a upstream.
The absence of correct offset leads a failed initialization ODR mode
assignment.
Select MAX ODR mode as the initialization ODR mode by field mask and
FIELD_PREP.
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-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 | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/drivers/iio/imu/fxos8700_core.c
+++ b/drivers/iio/imu/fxos8700_core.c
@@ -664,8 +664,10 @@ static int fxos8700_chip_init(struct fxo
return ret;
/* Max ODR (800Hz individual or 400Hz hybrid), active mode */
- return regmap_write(data->regmap, FXOS8700_CTRL_REG1,
- FXOS8700_CTRL_ODR_MAX | FXOS8700_ACTIVE);
+ return regmap_update_bits(data->regmap, FXOS8700_CTRL_REG1,
+ FXOS8700_CTRL_ODR_MSK | FXOS8700_ACTIVE,
+ FIELD_PREP(FXOS8700_CTRL_ODR_MSK, FXOS8700_CTRL_ODR_MAX) |
+ FXOS8700_ACTIVE);
}
static void fxos8700_chip_uninit(void *data)
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
