| Message ID | a67031c30724002724209dc1e0bba3c53c53a2a5.1570367532.git.lorenzo@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | various st_lsm6dsx fixes and missing bits | expand |
On Sun, 6 Oct 2019 15:22:07 +0200 Lorenzo Bianconi <lorenzo@kernel.org> wrote: > Add missing wake-up register info for LSM6DSO/LSM6DSOX sensor > > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to poke at it. Thanks, Jonathan > --- > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 25 +++++++++++++++++++- > 1 file changed, 24 insertions(+), 1 deletion(-) > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > index a2a0ac81e3d3..876f59cedc8b 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > @@ -780,6 +780,14 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { > .addr = 0x56, > .mask = BIT(6), > }, > + .irq1_func = { > + .addr = 0x5e, > + .mask = BIT(5), > + }, > + .irq2_func = { > + .addr = 0x5f, > + .mask = BIT(5), > + }, > .hla = { > .addr = 0x12, > .mask = BIT(5), > @@ -847,7 +855,22 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { > .slv0_addr = 0x15, > .dw_slv0_addr = 0x21, > .batch_en = BIT(3), > - } > + }, > + .event_settings = { > + .enable_reg = { > + .addr = 0x58, > + .mask = BIT(7), > + }, > + .wakeup_reg = { > + .addr = 0x5b, > + .mask = GENMASK(5, 0), > + }, > + .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), > + }, > }, > { > .wai = 0x6b,
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c index a2a0ac81e3d3..876f59cedc8b 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c @@ -780,6 +780,14 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x56, .mask = BIT(6), }, + .irq1_func = { + .addr = 0x5e, + .mask = BIT(5), + }, + .irq2_func = { + .addr = 0x5f, + .mask = BIT(5), + }, .hla = { .addr = 0x12, .mask = BIT(5), @@ -847,7 +855,22 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .slv0_addr = 0x15, .dw_slv0_addr = 0x21, .batch_en = BIT(3), - } + }, + .event_settings = { + .enable_reg = { + .addr = 0x58, + .mask = BIT(7), + }, + .wakeup_reg = { + .addr = 0x5b, + .mask = GENMASK(5, 0), + }, + .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), + }, }, { .wai = 0x6b,
Add missing wake-up register info for LSM6DSO/LSM6DSOX sensor Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> --- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 25 +++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)