From: Francesco Lavra <flavra@baylibre.com>
To: "Lorenzo Bianconi" <lorenzo@kernel.org>,
"Jonathan Cameron" <jic23@kernel.org>,
"David Lechner" <dlechner@baylibre.com>,
"Nuno Sá" <nuno.sa@analog.com>,
"Andy Shevchenko" <andy@kernel.org>,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@intel.com>
Subject: [PATCH v4 2/9] iio: imu: st_lsm6dsx: make event_settings more generic
Date: Mon, 1 Dec 2025 11:00:11 +0100 [thread overview]
Message-ID: <20251201100018.426749-3-flavra@baylibre.com> (raw)
In-Reply-To: <20251201100018.426749-1-flavra@baylibre.com>
The st_lsm6dsx_event_settings structure contains fields specific for one
event type (wakeup). In preparation for adding support for more event
types, introduce an event id enum and a generic event source structure, and
replace wakeup-specific data in struct st_lsm6dsx_event_settings with an
array of event source structures.
Signed-off-by: Francesco Lavra <flavra@baylibre.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 20 ++-
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 146 ++++++++++++-------
2 files changed, 106 insertions(+), 60 deletions(-)
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
index a4f558899767..80bc5686454b 100644
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
@@ -242,14 +242,22 @@ struct st_lsm6dsx_shub_settings {
u8 pause;
};
+enum st_lsm6dsx_event_id {
+ ST_LSM6DSX_EVENT_WAKEUP,
+ ST_LSM6DSX_EVENT_MAX
+};
+
+struct st_lsm6dsx_event_src {
+ struct st_lsm6dsx_reg value;
+ struct st_lsm6dsx_reg status;
+ u8 status_x_mask;
+ u8 status_y_mask;
+ u8 status_z_mask;
+};
+
struct st_lsm6dsx_event_settings {
struct st_lsm6dsx_reg enable_reg;
- struct st_lsm6dsx_reg wakeup_reg;
- u8 wakeup_src_reg;
- u8 wakeup_src_status_mask;
- u8 wakeup_src_z_mask;
- u8 wakeup_src_y_mask;
- u8 wakeup_src_x_mask;
+ struct st_lsm6dsx_event_src sources[ST_LSM6DSX_EVENT_MAX];
};
enum st_lsm6dsx_ext_sensor_id {
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
index a09df9d772dd..e8f0a2ff91be 100644
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
@@ -388,15 +388,21 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
},
},
.event_settings = {
- .wakeup_reg = {
- .addr = 0x5B,
- .mask = GENMASK(5, 0),
+ .sources = {
+ [ST_LSM6DSX_EVENT_WAKEUP] = {
+ .value = {
+ .addr = 0x5b,
+ .mask = GENMASK(5, 0),
+ },
+ .status = {
+ .addr = 0x1b,
+ .mask = BIT(3),
+ },
+ .status_z_mask = BIT(0),
+ .status_y_mask = BIT(1),
+ .status_x_mask = BIT(2),
+ },
},
- .wakeup_src_reg = 0x1b,
- .wakeup_src_status_mask = BIT(3),
- .wakeup_src_z_mask = BIT(0),
- .wakeup_src_y_mask = BIT(1),
- .wakeup_src_x_mask = BIT(2),
},
},
{
@@ -554,15 +560,21 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
},
},
.event_settings = {
- .wakeup_reg = {
- .addr = 0x5B,
- .mask = GENMASK(5, 0),
+ .sources = {
+ [ST_LSM6DSX_EVENT_WAKEUP] = {
+ .value = {
+ .addr = 0x5b,
+ .mask = GENMASK(5, 0),
+ },
+ .status = {
+ .addr = 0x1b,
+ .mask = BIT(3),
+ },
+ .status_z_mask = BIT(0),
+ .status_y_mask = BIT(1),
+ .status_x_mask = BIT(2),
+ },
},
- .wakeup_src_reg = 0x1b,
- .wakeup_src_status_mask = BIT(3),
- .wakeup_src_z_mask = BIT(0),
- .wakeup_src_y_mask = BIT(1),
- .wakeup_src_x_mask = BIT(2),
},
},
{
@@ -791,15 +803,21 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.addr = 0x58,
.mask = BIT(7),
},
- .wakeup_reg = {
- .addr = 0x5B,
- .mask = GENMASK(5, 0),
+ .sources = {
+ [ST_LSM6DSX_EVENT_WAKEUP] = {
+ .value = {
+ .addr = 0x5b,
+ .mask = GENMASK(5, 0),
+ },
+ .status = {
+ .addr = 0x1b,
+ .mask = BIT(3),
+ },
+ .status_z_mask = BIT(0),
+ .status_y_mask = BIT(1),
+ .status_x_mask = BIT(2),
+ },
},
- .wakeup_src_reg = 0x1b,
- .wakeup_src_status_mask = BIT(3),
- .wakeup_src_z_mask = BIT(0),
- .wakeup_src_y_mask = BIT(1),
- .wakeup_src_x_mask = BIT(2),
},
},
{
@@ -1028,15 +1046,21 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.addr = 0x58,
.mask = BIT(7),
},
- .wakeup_reg = {
- .addr = 0x5b,
- .mask = GENMASK(5, 0),
+ .sources = {
+ [ST_LSM6DSX_EVENT_WAKEUP] = {
+ .value = {
+ .addr = 0x5b,
+ .mask = GENMASK(5, 0),
+ },
+ .status = {
+ .addr = 0x1b,
+ .mask = BIT(3),
+ },
+ .status_z_mask = BIT(0),
+ .status_y_mask = BIT(1),
+ .status_x_mask = BIT(2),
+ },
},
- .wakeup_src_reg = 0x1b,
- .wakeup_src_status_mask = BIT(3),
- .wakeup_src_z_mask = BIT(0),
- .wakeup_src_y_mask = BIT(1),
- .wakeup_src_x_mask = BIT(2),
},
},
{
@@ -1209,15 +1233,21 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.addr = 0x58,
.mask = BIT(7),
},
- .wakeup_reg = {
- .addr = 0x5B,
- .mask = GENMASK(5, 0),
+ .sources = {
+ [ST_LSM6DSX_EVENT_WAKEUP] = {
+ .value = {
+ .addr = 0x5b,
+ .mask = GENMASK(5, 0),
+ },
+ .status = {
+ .addr = 0x1b,
+ .mask = BIT(3),
+ },
+ .status_z_mask = BIT(0),
+ .status_y_mask = BIT(1),
+ .status_x_mask = BIT(2),
+ },
},
- .wakeup_src_reg = 0x1b,
- .wakeup_src_status_mask = BIT(3),
- .wakeup_src_z_mask = BIT(0),
- .wakeup_src_y_mask = BIT(1),
- .wakeup_src_x_mask = BIT(2),
},
},
{
@@ -1415,15 +1445,21 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.addr = 0x50,
.mask = BIT(7),
},
- .wakeup_reg = {
- .addr = 0x5b,
- .mask = GENMASK(5, 0),
+ .sources = {
+ [ST_LSM6DSX_EVENT_WAKEUP] = {
+ .value = {
+ .addr = 0x5b,
+ .mask = GENMASK(5, 0),
+ },
+ .status = {
+ .addr = 0x45,
+ .mask = BIT(3),
+ },
+ .status_z_mask = BIT(0),
+ .status_y_mask = BIT(1),
+ .status_x_mask = BIT(2),
+ },
},
- .wakeup_src_reg = 0x45,
- .wakeup_src_status_mask = BIT(3),
- .wakeup_src_z_mask = BIT(0),
- .wakeup_src_y_mask = BIT(1),
- .wakeup_src_x_mask = BIT(2),
},
},
{
@@ -1935,7 +1971,7 @@ st_lsm6dsx_write_event(struct iio_dev *iio_dev,
if (val < 0 || val > 31)
return -EINVAL;
- reg = &hw->settings->event_settings.wakeup_reg;
+ reg = &hw->settings->event_settings.sources[ST_LSM6DSX_EVENT_WAKEUP].value;
data = ST_LSM6DSX_SHIFT_VAL(val, reg->mask);
err = st_lsm6dsx_update_bits_locked(hw, reg->addr,
reg->mask, data);
@@ -2420,6 +2456,7 @@ static bool
st_lsm6dsx_report_motion_event(struct st_lsm6dsx_hw *hw)
{
const struct st_lsm6dsx_event_settings *event_settings;
+ const struct st_lsm6dsx_event_src *src;
int err, data;
s64 timestamp;
@@ -2427,13 +2464,14 @@ st_lsm6dsx_report_motion_event(struct st_lsm6dsx_hw *hw)
return false;
event_settings = &hw->settings->event_settings;
- err = st_lsm6dsx_read_locked(hw, event_settings->wakeup_src_reg,
+ src = &event_settings->sources[ST_LSM6DSX_EVENT_WAKEUP];
+ err = st_lsm6dsx_read_locked(hw, src->status.addr,
&data, sizeof(data));
if (err < 0)
return false;
timestamp = iio_get_time_ns(hw->iio_devs[ST_LSM6DSX_ID_ACC]);
- if ((data & hw->settings->event_settings.wakeup_src_z_mask) &&
+ if ((data & src->status_z_mask) &&
(hw->enable_event & BIT(IIO_MOD_Z)))
iio_push_event(hw->iio_devs[ST_LSM6DSX_ID_ACC],
IIO_MOD_EVENT_CODE(IIO_ACCEL,
@@ -2443,7 +2481,7 @@ st_lsm6dsx_report_motion_event(struct st_lsm6dsx_hw *hw)
IIO_EV_DIR_EITHER),
timestamp);
- if ((data & hw->settings->event_settings.wakeup_src_y_mask) &&
+ if ((data & src->status_y_mask) &&
(hw->enable_event & BIT(IIO_MOD_Y)))
iio_push_event(hw->iio_devs[ST_LSM6DSX_ID_ACC],
IIO_MOD_EVENT_CODE(IIO_ACCEL,
@@ -2453,7 +2491,7 @@ st_lsm6dsx_report_motion_event(struct st_lsm6dsx_hw *hw)
IIO_EV_DIR_EITHER),
timestamp);
- if ((data & hw->settings->event_settings.wakeup_src_x_mask) &&
+ if ((data & src->status_x_mask) &&
(hw->enable_event & BIT(IIO_MOD_X)))
iio_push_event(hw->iio_devs[ST_LSM6DSX_ID_ACC],
IIO_MOD_EVENT_CODE(IIO_ACCEL,
@@ -2463,7 +2501,7 @@ st_lsm6dsx_report_motion_event(struct st_lsm6dsx_hw *hw)
IIO_EV_DIR_EITHER),
timestamp);
- return data & event_settings->wakeup_src_status_mask;
+ return data & src->status.mask;
}
static irqreturn_t st_lsm6dsx_handler_thread(int irq, void *private)
--
2.39.5
next prev parent reply other threads:[~2025-12-01 10:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-01 10:00 [PATCH v4 0/9] st_lsm6dsx: add tap event detection Francesco Lavra
2025-12-01 10:00 ` [PATCH v4 1/9] iio: imu: st_lsm6dsx: fix iio_chan_spec for sensors without " Francesco Lavra
2025-12-07 15:15 ` Jonathan Cameron
2025-12-01 10:00 ` Francesco Lavra [this message]
2025-12-07 15:21 ` [PATCH v4 2/9] iio: imu: st_lsm6dsx: make event_settings more generic Jonathan Cameron
2025-12-01 10:00 ` [PATCH v4 3/9] iio: imu: st_lsm6dsx: move wakeup event enable mask to event_src Francesco Lavra
2025-12-07 15:22 ` Jonathan Cameron
2025-12-01 10:00 ` [PATCH v4 4/9] iio: imu: st_lsm6dsx: rework code to check for enabled events Francesco Lavra
2025-12-07 15:27 ` Jonathan Cameron
2025-12-01 10:00 ` [PATCH v4 5/9] iio: imu: st_lsm6dsx: remove event_threshold field from hw struct Francesco Lavra
2025-12-07 15:31 ` Jonathan Cameron
2025-12-07 22:50 ` Andy Shevchenko
2025-12-01 10:00 ` [PATCH v4 6/9] iio: imu: st_lsm6dsx: make event management functions generic Francesco Lavra
2025-12-07 15:33 ` Jonathan Cameron
2025-12-01 10:00 ` [PATCH v4 7/9] iio: imu: st_lsm6dsx: add event configurability on a per axis basis Francesco Lavra
2025-12-07 15:35 ` Jonathan Cameron
2025-12-01 10:00 ` [PATCH v4 8/9] iio: imu: st_lsm6dsx: add event spec parameter to iio_chan_spec initializer Francesco Lavra
2025-12-07 15:36 ` Jonathan Cameron
2025-12-01 10:00 ` [PATCH v4 9/9] iio: imu: st_lsm6dsx: add tap event detection Francesco Lavra
2025-12-07 15:40 ` Jonathan Cameron
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=20251201100018.426749-3-flavra@baylibre.com \
--to=flavra@baylibre.com \
--cc=andriy.shevchenko@intel.com \
--cc=andy@kernel.org \
--cc=dlechner@baylibre.com \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lorenzo@kernel.org \
--cc=nuno.sa@analog.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox