From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: inv.git-commit@tdk.com, Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.6.y] iio: imu: inv_icm42600: fix timestamps after suspend if sensor is on
Date: Mon, 13 Jan 2025 18:09:25 -0500 [thread overview]
Message-ID: <20250113160649-c595879e30bf00b9@stable.kernel.org> (raw)
In-Reply-To: <20250113143131.568417-1-inv.git-commit@tdk.com>
[ 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 Maneyrol<jean-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-v1-1-dfc77c394173@tdk.com
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 |
prev parent reply other threads:[~2025-01-13 23:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-13 10:45 FAILED: patch "[PATCH] iio: imu: inv_icm42600: fix timestamps after suspend if" failed to apply to 6.6-stable tree gregkh
2025-01-13 14:31 ` [PATCH 6.6.y] iio: imu: inv_icm42600: fix timestamps after suspend if sensor is on inv.git-commit
2025-01-13 23:09 ` Sasha Levin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250113160649-c595879e30bf00b9@stable.kernel.org \
--to=sashal@kernel.org \
--cc=inv.git-commit@tdk.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.