[ Sasha's backport helper bot ]
Hi,
Found matching upstream commit: 65a60a590142c54a3f3be11ff162db2d5b0e1e06
WARNING: Author mismatch between patch and found commit: Backport author: inv.git-commit@tdk.com Commit author: Jean-Baptiste Maneyroljean-baptiste.maneyrol@tdk.com
Status in newer kernel trees: 6.12.y | Present (different SHA1: 7982d8f24a9b) 6.6.y | Not found
Note: The patch differs from the upstream commit: --- 1: 65a60a590142 ! 1: 9c96f19a264e iio: imu: inv_icm42600: fix timestamps after suspend if sensor is on @@ Commit message Signed-off-by: Jean-Baptiste Maneyrol jean-baptiste.maneyrol@tdk.com Link: https://patch.msgid.link/20241113-inv_icm42600-fix-timestamps-after-suspend-... Signed-off-by: Jonathan Cameron Jonathan.Cameron@huawei.com + (cherry picked from commit 65a60a590142c54a3f3be11ff162db2d5b0e1e06)
## drivers/iio/imu/inv_icm42600/inv_icm42600_core.c ## +@@ + #include <linux/regmap.h> + + #include <linux/iio/iio.h> ++#include <linux/iio/common/inv_sensors_timestamp.h> + + #include "inv_icm42600.h" + #include "inv_icm42600_buffer.h" @@ drivers/iio/imu/inv_icm42600/inv_icm42600_core.c: static int inv_icm42600_suspend(struct device *dev) static int inv_icm42600_resume(struct device *dev) { struct inv_icm42600_state *st = dev_get_drvdata(dev); -+ struct inv_icm42600_sensor_state *gyro_st = iio_priv(st->indio_gyro); -+ struct inv_icm42600_sensor_state *accel_st = iio_priv(st->indio_accel); ++ struct inv_sensors_timestamp *gyro_ts = iio_priv(st->indio_gyro); ++ struct inv_sensors_timestamp *accel_ts = iio_priv(st->indio_accel); int ret;
mutex_lock(&st->lock); @@ drivers/iio/imu/inv_icm42600/inv_icm42600_core.c: static int inv_icm42600_resume /* restore FIFO data streaming */ - if (st->fifo.on) + if (st->fifo.on) { -+ inv_sensors_timestamp_reset(&gyro_st->ts); -+ inv_sensors_timestamp_reset(&accel_st->ts); ++ inv_sensors_timestamp_reset(gyro_ts); ++ inv_sensors_timestamp_reset(accel_ts); ret = regmap_write(st->map, INV_ICM42600_REG_FIFO_CONFIG, INV_ICM42600_FIFO_CONFIG_STREAM); + } ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success |