| Message ID | 20190916135630.2211714-3-sean@geanix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v10,1/5] iio: imu: st_lsm6dsx: move interrupt thread to core | expand |
On Mon, 16 Sep 2019 15:56:28 +0200 Sean Nyekjaer <sean@geanix.com> wrote: > This add ways for the SoC to wake from accelerometer wake events. > > In the suspend function we skip disabling the sensor if wakeup-source > and events are activated. > > Signed-off-by: Sean Nyekjaer <sean@geanix.com> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to poke it. Thanks, Jonathan > --- > Changes since v4: > * More devices supports wakeup > > Changes since v5: > * None > > Changes since v6: > * None > > Changes since v7: > * Add check for hw->enable_event > * Moved disable_irq_wake section so it's called > * Removed not neeeded continue from disable_irq_wake section > > Changes since v8: > * Using sensor->id instead of i in suspend/resume loops > > Changes since v9: > * None > > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > index 4198ba263d03..a7f12cf57f11 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > @@ -1858,6 +1858,9 @@ int st_lsm6dsx_probe(struct device *dev, int irq, int hw_id, > return err; > } > > + if (dev->of_node && of_property_read_bool(dev->of_node, "wakeup-source")) > + device_init_wakeup(dev, true); > + > return 0; > } > EXPORT_SYMBOL(st_lsm6dsx_probe); > @@ -1876,6 +1879,13 @@ static int __maybe_unused st_lsm6dsx_suspend(struct device *dev) > if (!(hw->enable_mask & BIT(sensor->id))) > continue; > > + if (device_may_wakeup(dev) && > + sensor->id == ST_LSM6DSX_ID_ACC && hw->enable_event) { > + /* Enable wake from IRQ */ > + enable_irq_wake(hw->irq); > + continue; > + } > + > if (sensor->id == ST_LSM6DSX_ID_EXT0 || > sensor->id == ST_LSM6DSX_ID_EXT1 || > sensor->id == ST_LSM6DSX_ID_EXT2) > @@ -1905,6 +1915,10 @@ static int __maybe_unused st_lsm6dsx_resume(struct device *dev) > continue; > > sensor = iio_priv(hw->iio_devs[i]); > + if (device_may_wakeup(dev) && > + sensor->id == ST_LSM6DSX_ID_ACC && hw->enable_event) > + disable_irq_wake(hw->irq); > + > if (!(hw->suspend_mask & BIT(sensor->id))) > continue; >
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c index 4198ba263d03..a7f12cf57f11 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c @@ -1858,6 +1858,9 @@ int st_lsm6dsx_probe(struct device *dev, int irq, int hw_id, return err; } + if (dev->of_node && of_property_read_bool(dev->of_node, "wakeup-source")) + device_init_wakeup(dev, true); + return 0; } EXPORT_SYMBOL(st_lsm6dsx_probe); @@ -1876,6 +1879,13 @@ static int __maybe_unused st_lsm6dsx_suspend(struct device *dev) if (!(hw->enable_mask & BIT(sensor->id))) continue; + if (device_may_wakeup(dev) && + sensor->id == ST_LSM6DSX_ID_ACC && hw->enable_event) { + /* Enable wake from IRQ */ + enable_irq_wake(hw->irq); + continue; + } + if (sensor->id == ST_LSM6DSX_ID_EXT0 || sensor->id == ST_LSM6DSX_ID_EXT1 || sensor->id == ST_LSM6DSX_ID_EXT2) @@ -1905,6 +1915,10 @@ static int __maybe_unused st_lsm6dsx_resume(struct device *dev) continue; sensor = iio_priv(hw->iio_devs[i]); + if (device_may_wakeup(dev) && + sensor->id == ST_LSM6DSX_ID_ACC && hw->enable_event) + disable_irq_wake(hw->irq); + if (!(hw->suspend_mask & BIT(sensor->id))) continue;
This add ways for the SoC to wake from accelerometer wake events. In the suspend function we skip disabling the sensor if wakeup-source and events are activated. Signed-off-by: Sean Nyekjaer <sean@geanix.com> --- Changes since v4: * More devices supports wakeup Changes since v5: * None Changes since v6: * None Changes since v7: * Add check for hw->enable_event * Moved disable_irq_wake section so it's called * Removed not neeeded continue from disable_irq_wake section Changes since v8: * Using sensor->id instead of i in suspend/resume loops Changes since v9: * None drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)