iio: imu: st_lsm6dsx: move interrupt thread to core
Subsystems (2)
PATCH v10 1/5 iio: imu: st_lsm6dsx: move interrupt thread to core
This prepares the interrupt to be used for other stuff than fifo reading + event readings.
--- .../iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 78 +--------------- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 88 +++++++++++++++++++ 2 files changed, 89 insertions(+), 77 deletions(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c +1 -77
@@ -30,8 +30,6 @@* Denis Ciocca <[email protected]> */ #include <linux/module.h> -#include <linux/interrupt.h> -#include <linux/irq.h> #include <linux/iio/kfifo_buf.h> #include <linux/iio/iio.h> #include <linux/iio/buffer.h>
@@ -42,10 +40,6 @@#include "st_lsm6dsx.h" -#define ST_LSM6DSX_REG_HLACTIVE_ADDR 0x12 -#define ST_LSM6DSX_REG_HLACTIVE_MASK BIT(5) -#define ST_LSM6DSX_REG_PP_OD_ADDR 0x12 -#define ST_LSM6DSX_REG_PP_OD_MASK BIT(4)#define ST_LSM6DSX_REG_FIFO_MODE_ADDR 0x0a#define ST_LSM6DSX_FIFO_MODE_MASK GENMASK(2, 0)#define ST_LSM6DSX_FIFO_ODR_MASK GENMASK(6, 3)
@@ -654,25 +648,6 @@ int st_lsm6dsx_update_fifo(struct st_lsm6dsx_sensor *sensor, bool enable)return err; } -static irqreturn_t st_lsm6dsx_handler_irq (int irq,void *private) -{ -struct st_lsm6dsx_hw *hw = private; - -return hw->sip >0 ?IRQ_WAKE_THREAD :IRQ_NONE ; -} - -static irqreturn_t st_lsm6dsx_handler_thread (int irq,void *private) -{ -struct st_lsm6dsx_hw *hw = private; -int count; - -mutex_lock (&hw->fifo_lock); - count = hw->settings->fifo_ops.read_fifo (hw); -mutex_unlock (&hw->fifo_lock); - -return count ?IRQ_HANDLED :IRQ_NONE ; -} -static int st_lsm6dsx_buffer_preenable (struct iio_dev *iio_dev) {struct st_lsm6dsx_sensor *sensor =iio_priv (iio_dev);
@@ -702,59 +677,8 @@ static const struct iio_buffer_setup_ops st_lsm6dsx_buffer_ops = {int st_lsm6dsx_fifo_setup (struct st_lsm6dsx_hw *hw) { -struct device_node *np = hw->dev->of_node; -struct st_sensors_platform_data *pdata;struct iio_buffer *buffer; -unsigned long irq_type; -bool irq_active_low; -int i, err; - - irq_type =irqd_get_trigger_type (irq_get_irq_data (hw->irq)); - -switch (irq_type) { -case IRQF_TRIGGER_HIGH : -case IRQF_TRIGGER_RISING : - irq_active_low = false; -break ; -case IRQF_TRIGGER_LOW : -case IRQF_TRIGGER_FALLING : - irq_active_low = true; -break ; -default : -dev_info (hw->dev,"mode %lx unsupported\n" , irq_type); -return -EINVAL ; - } - - err =regmap_update_bits (hw->regmap,ST_LSM6DSX_REG_HLACTIVE_ADDR , -ST_LSM6DSX_REG_HLACTIVE_MASK , -FIELD_PREP (ST_LSM6DSX_REG_HLACTIVE_MASK , - irq_active_low)); -if (err <0 ) -return err; - - pdata = (struct st_sensors_platform_data *)hw->dev->platform_data; -if ((np &&of_property_read_bool (np,"drive-open-drain" )) || - (pdata && pdata->open_drain)) { - err =regmap_update_bits (hw->regmap,ST_LSM6DSX_REG_PP_OD_ADDR , -ST_LSM6DSX_REG_PP_OD_MASK , -FIELD_PREP (ST_LSM6DSX_REG_PP_OD_MASK , -1 )); -if (err <0 ) -return err; - - irq_type |=IRQF_SHARED ; - } - - err =devm_request_threaded_irq (hw->dev, hw->irq, - st_lsm6dsx_handler_irq, - st_lsm6dsx_handler_thread, - irq_type |IRQF_ONESHOT , -"lsm6dsx" , hw); -if (err) { -dev_err (hw->dev,"failed to request trigger irq %d\n" , - hw->irq); -return err; - } +int i;for (i =0 ; i <ST_LSM6DSX_ID_MAX ; i++) {if (!hw->iio_devs[i])
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +88 -0
112 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH v10 2/5 iio: imu: st_lsm6dsx: add motion events
Add event channels that controls the creation of motion events. Tested on ISM330DLC
---
Changes since v4:
* Added check for event support
* Added registers for more devices that support this event
Changes since v5:
* Moved wakeup_src masks to PATCH 5/6
Changes since v6:
* None
Changes since v7:
* None
Changes since v8:
* None
Changes since v10:
* enable_event changed to a u8
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 41 ++++ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 191 ++++++++++++++++++- 2 files changed, 228 insertions(+), 4 deletions(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +41 -0
@@ -12,6 +12,7 @@#define ST_LSM6DSX_H #include <linux/device.h> +#include <linux/iio/iio.h> #define ST_LSM6DS3_DEV_NAME "lsm6ds3"#define ST_LSM6DS3H_DEV_NAME "lsm6ds3h"
@@ -54,6 +55,26 @@ enum st_lsm6dsx_hw_id { * ST_LSM6DSX_TAGGED_SAMPLE_SIZE)#define ST_LSM6DSX_SHIFT_VAL (val, mask) (((val) << __ffs(mask)) & (mask)) +#define ST_LSM6DSX_CHANNEL_ACC (chan_type, addr, mod, scan_idx) \ +{ \ + .type = chan_type, \ + .address = addr, \ + .modified = 1, \ + .channel2 = mod, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \ + .scan_index = scan_idx, \ + .scan_type = { \ + .sign = 's', \ + .realbits = 16, \ + .storagebits = 16, \ + .endianness = IIO_LE, \ + }, \ + .event_spec = &st_lsm6dsx_event, \ + .num_event_specs = 1, \ +} +#define ST_LSM6DSX_CHANNEL (chan_type, addr, mod, scan_idx) \ { \ .type = chan_type, \
@@ -162,6 +183,11 @@ struct st_lsm6dsx_shub_settings {u8 batch_en; }; +struct st_lsm6dsx_event_settings { +struct st_lsm6dsx_reg enable_reg; +struct st_lsm6dsx_reg wakeup_reg; +}; +enum st_lsm6dsx_ext_sensor_id {ST_LSM6DSX_ID_MAGN , };
@@ -225,6 +251,9 @@ struct st_lsm6dsx_settings {u8 wai;u8 int1_addr;u8 int2_addr; +u8 int1_func_addr; +u8 int2_func_addr; +u8 int_func_mask;u8 reset_addr;u16 max_fifo_size;struct {
@@ -244,6 +273,7 @@ struct st_lsm6dsx_settings {struct st_lsm6dsx_fifo_ops fifo_ops;struct st_lsm6dsx_hw_ts_settings ts_settings;struct st_lsm6dsx_shub_settings shub_settings; +struct st_lsm6dsx_event_settings event_settings; };enum st_lsm6dsx_sensor_id {
@@ -324,6 +354,10 @@ struct st_lsm6dsx_hw {u8 ts_sip;u8 sip; +u8 event_threshold; +u8 enable_event; +struct st_lsm6dsx_reg irq_routing; +u8 *buff;struct iio_dev *iio_devs[ST_LSM6DSX_ID_MAX ];
@@ -331,6 +365,13 @@ struct st_lsm6dsx_hw {const struct st_lsm6dsx_settings *settings; }; +static const struct iio_event_spec st_lsm6dsx_event = { + .type =IIO_EV_TYPE_THRESH , + .dir =IIO_EV_DIR_EITHER , + .mask_separate =BIT (IIO_EV_INFO_VALUE ) | +BIT (IIO_EV_INFO_ENABLE ) +}; +static const unsigned long st_lsm6dsx_available_scan_masks[] = {0x7 ,0x0 };extern const struct dev_pm_ops st_lsm6dsx_pm_ops;
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +187 -4
281 lines not on this page · raw message
Signature · 1 line
2.23.0
Re: [PATCH v10 2/5] iio: imu: st_lsm6dsx: add motion events
Quoted 4 lines · On Mon, 16 Sep 2019 15:56:27 +0200 Sean Nyekjaer <[email protected]> wrote:
Add event channels that controls the creation of motion events. Tested on ISM330DLC
Signed-off-by Sean Nyekjaer <[email protected]>
st_lsm6dsx_event_setup not declared.. Fixed up by adding static marking.
Applied
Thanks,
Jonathan
Quoted 415 lines
---
Changes since v4:
* Added check for event support
* Added registers for more devices that support this eventChanges since v5:
* Movedwakeup_srcmasks to PATCH 5/6Changes since v6:
* NoneChanges since v7:
* NoneChanges since v8:
* NoneChanges since v10:
*enable_eventchanged to a u8drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 41 ++++ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 191 ++++++++++++++++++- 2 files changed, 228 insertions(+), 4 deletions(-)drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +41
-0@@ -12,6 +12,7 @@#define ST_LSM6DSX_H #include <linux/device.h> +#include <linux/iio/iio.h> #define ST_LSM6DS3_DEV_NAME "lsm6ds3"#define ST_LSM6DS3H_DEV_NAME "lsm6ds3h"@@ -54,6 +55,26 @@ enum st_lsm6dsx_hw_id { * ST_LSM6DSX_TAGGED_SAMPLE_SIZE)#define ST_LSM6DSX_SHIFT_VAL (val, mask) (((val) << __ffs(mask)) & (mask)) +#define ST_LSM6DSX_CHANNEL_ACC (chan_type, addr, mod, scan_idx) \ +{ \ + .type = chan_type, \ + .address = addr, \ + .modified = 1, \ + .channel2 = mod, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \ + .scan_index = scan_idx, \ + .scan_type = { \ + .sign = 's', \ + .realbits = 16, \ + .storagebits = 16, \ + .endianness = IIO_LE, \ + }, \ + .event_spec = &st_lsm6dsx_event, \ + .num_event_specs = 1, \ +} +#define ST_LSM6DSX_CHANNEL (chan_type, addr, mod, scan_idx) \ { \ .type = chan_type, \@@ -162,6 +183,11 @@ struct st_lsm6dsx_shub_settings {u8 batch_en; }; +struct st_lsm6dsx_event_settings { +struct st_lsm6dsx_reg enable_reg; +struct st_lsm6dsx_reg wakeup_reg; +}; +enum st_lsm6dsx_ext_sensor_id {ST_LSM6DSX_ID_MAGN , };@@ -225,6 +251,9 @@ struct st_lsm6dsx_settings {u8 wai;u8 int1_addr;u8 int2_addr; +u8 int1_func_addr; +u8 int2_func_addr; +u8 int_func_mask;u8 reset_addr;u16 max_fifo_size;struct {@@ -244,6 +273,7 @@ struct st_lsm6dsx_settings {struct st_lsm6dsx_fifo_ops fifo_ops;struct st_lsm6dsx_hw_ts_settings ts_settings;struct st_lsm6dsx_shub_settings shub_settings; +struct st_lsm6dsx_event_settings event_settings; };enum st_lsm6dsx_sensor_id {@@ -324,6 +354,10 @@ struct st_lsm6dsx_hw {u8 ts_sip;u8 sip; +u8 event_threshold; +u8 enable_event; +struct st_lsm6dsx_reg irq_routing; +u8 *buff;struct iio_dev *iio_devs[ST_LSM6DSX_ID_MAX ];@@ -331,6 +365,13 @@ struct st_lsm6dsx_hw {const struct st_lsm6dsx_settings *settings; }; +static const struct iio_event_spec st_lsm6dsx_event = { + .type =IIO_EV_TYPE_THRESH , + .dir =IIO_EV_DIR_EITHER , + .mask_separate =BIT (IIO_EV_INFO_VALUE ) | +BIT (IIO_EV_INFO_ENABLE ) +}; +static const unsigned long st_lsm6dsx_available_scan_masks[] = {0x7 ,0x0 };extern const struct dev_pm_ops st_lsm6dsx_pm_ops;drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +187
-4@@ -73,9 +73,9 @@#define ST_LSM6DSX_REG_PP_OD_MASK BIT(4)static const struct iio_chan_spec st_lsm6dsx_acc_channels[] = { -ST_LSM6DSX_CHANNEL (IIO_ACCEL ,0x28 ,IIO_MOD_X ,0 ), -ST_LSM6DSX_CHANNEL (IIO_ACCEL ,0x2a ,IIO_MOD_Y ,1 ), -ST_LSM6DSX_CHANNEL (IIO_ACCEL ,0x2c ,IIO_MOD_Z ,2 ), +ST_LSM6DSX_CHANNEL_ACC (IIO_ACCEL ,0x28 ,IIO_MOD_X ,0 ), +ST_LSM6DSX_CHANNEL_ACC (IIO_ACCEL ,0x2a ,IIO_MOD_Y ,1 ), +ST_LSM6DSX_CHANNEL_ACC (IIO_ACCEL ,0x2c ,IIO_MOD_Z ,2 ),IIO_CHAN_SOFT_TIMESTAMP (3 ), };@@ -168,6 +168,9 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .wai = 0x69, .int1_addr = 0x0d, .int2_addr = 0x0e, + .int1_func_addr = 0x5e, + .int2_func_addr = 0x5f, + .int_func_mask = BIT(5), .reset_addr = 0x12, .max_fifo_size = 1365, .id = {@@ -279,11 +282,20 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .mask = GENMASK(5, 3), }, }, + .event_settings = { + .wakeup_reg = { + .addr = 0x5B, + .mask = GENMASK(5, 0), + }, + }, }, { .wai = 0x69, .int1_addr = 0x0d, .int2_addr = 0x0e, + .int1_func_addr = 0x5e, + .int2_func_addr = 0x5f, + .int_func_mask = BIT(5), .reset_addr = 0x12, .max_fifo_size = 682, .id = {@@ -395,11 +407,20 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .mask = GENMASK(5, 3), }, }, + .event_settings = { + .wakeup_reg = { + .addr = 0x5B, + .mask = GENMASK(5, 0), + }, + }, }, { .wai = 0x6a, .int1_addr = 0x0d, .int2_addr = 0x0e, + .int1_func_addr = 0x5e, + .int2_func_addr = 0x5f, + .int_func_mask = BIT(5), .reset_addr = 0x12, .max_fifo_size = 682, .id = {@@ -520,6 +541,16 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .mask = GENMASK(5, 3), }, }, + .event_settings = { + .enable_reg = { + .addr = 0x58, + .mask = BIT(7), + }, + .wakeup_reg = { + .addr = 0x5B, + .mask = GENMASK(5, 0), + }, + }, }, { .wai = 0x6c,@@ -666,6 +697,9 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .wai = 0x6b, .int1_addr = 0x0d, .int2_addr = 0x0e, + .int1_func_addr = 0x5e, + .int2_func_addr = 0x5f, + .int_func_mask = BIT(5), .reset_addr = 0x12, .max_fifo_size = 512, .id = {@@ -773,11 +807,24 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .mask = GENMASK(7, 6), }, }, + .event_settings = { + .enable_reg = { + .addr = 0x58, + .mask = BIT(7), + }, + .wakeup_reg = { + .addr = 0x5B, + .mask = GENMASK(5, 0), + }, + }, }, { .wai = 0x6b, .int1_addr = 0x0d, .int2_addr = 0x0e, + .int1_func_addr = 0x5e, + .int2_func_addr = 0x5f, + .int_func_mask = BIT(5), .reset_addr = 0x12, .max_fifo_size = 512, .id = {@@ -913,6 +960,16 @@ 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), + }, } }, };@@ -1119,7 +1176,8 @@ static int st_lsm6dsx_read_oneshot(struct st_lsm6dsx_sensor *sensor,if (err <0 )return err; -st_lsm6dsx_sensor_set_enable (sensor, false); +if (!hw->enable_event) +st_lsm6dsx_sensor_set_enable (sensor, false); *val = (s16 )le16_to_cpu (data);@@ -1192,6 +1250,123 @@ static int st_lsm6dsx_write_raw(struct iio_dev *iio_dev,return err; } +int st_lsm6dsx_event_setup (struct st_lsm6dsx_hw *hw,int state) +{ +int err; +u8 enable =0 ; + +if (!hw->settings->int1_func_addr) +return -ENOTSUPP ; + + enable = state ? hw->settings->event_settings.enable_reg.mask :0 ; + + err =regmap_update_bits (hw->regmap, + hw->settings->event_settings.enable_reg.addr, + hw->settings->event_settings.enable_reg.mask, + enable); +if (err <0 ) +return err; + + enable = state ? hw->irq_routing.mask :0 ; + +/* Enable wakeup interrupt */ +return regmap_update_bits (hw->regmap, hw->irq_routing.addr, + hw->irq_routing.mask, + enable); +} + +static int st_lsm6dsx_read_event (struct iio_dev *iio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +enum iio_event_info info, +int *val,int *val2) +{ +struct st_lsm6dsx_sensor *sensor =iio_priv (iio_dev); +struct st_lsm6dsx_hw *hw = sensor->hw; + +if (type !=IIO_EV_TYPE_THRESH ) +return -EINVAL ; + + *val2 =0 ; + *val = hw->event_threshold; + +return IIO_VAL_INT ; +} + +static int st_lsm6dsx_write_event (struct iio_dev *iio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +enum iio_event_info info, +int val,int val2) +{ +struct st_lsm6dsx_sensor *sensor =iio_priv (iio_dev); +struct st_lsm6dsx_hw *hw = sensor->hw; +int err; + +if (type !=IIO_EV_TYPE_THRESH ) +return -EINVAL ; + +if (val <0 || val >31 ) +return -EINVAL ; + + err =regmap_update_bits (hw->regmap, + hw->settings->event_settings.wakeup_reg.addr, + hw->settings->event_settings.wakeup_reg.mask, + val); +if (err) +return -EINVAL ; + + hw->event_threshold = val; + +return 0 ; +} + +static int st_lsm6dsx_read_event_config (struct iio_dev *iio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir) +{ +struct st_lsm6dsx_sensor *sensor =iio_priv (iio_dev); +struct st_lsm6dsx_hw *hw = sensor->hw; + +if (type !=IIO_EV_TYPE_THRESH ) +return -EINVAL ; + +return hw->enable_event; +} + +static int st_lsm6dsx_write_event_config (struct iio_dev *iio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +int state) +{ +struct st_lsm6dsx_sensor *sensor =iio_priv (iio_dev); +struct st_lsm6dsx_hw *hw = sensor->hw; +int err =0 ; + +if (type !=IIO_EV_TYPE_THRESH ) +return -EINVAL ; + +/* do not enable events if they are already enabled */ +if (state && hw->enable_event) +return 0 ; + + err =st_lsm6dsx_event_setup (hw, state); +if (err <0 ) +return err; + + err =st_lsm6dsx_sensor_set_enable (sensor, state); +if (err <0 ) +return err; + + hw->enable_event = state; + +return 0 ; +} +int st_lsm6dsx_set_watermark (struct iio_dev *iio_dev,unsigned int val) {struct st_lsm6dsx_sensor *sensor =iio_priv (iio_dev);@@ -1276,6 +1451,10 @@ static const struct iio_info st_lsm6dsx_acc_info = { .attrs = &st_lsm6dsx_acc_attribute_group, .read_raw = st_lsm6dsx_read_raw, .write_raw = st_lsm6dsx_write_raw, + .read_event_value = st_lsm6dsx_read_event, + .write_event_value = st_lsm6dsx_write_event, + .read_event_config = st_lsm6dsx_read_event_config, + .write_event_config = st_lsm6dsx_write_event_config, .hwfifo_set_watermark = st_lsm6dsx_set_watermark, };@@ -1321,9 +1500,13 @@ static int st_lsm6dsx_get_drdy_reg(struct st_lsm6dsx_hw *hw, u8 *drdy_reg)switch (drdy_pin) {case 1 : *drdy_reg = hw->settings->int1_addr; + hw->irq_routing.addr = hw->settings->int1_func_addr; + hw->irq_routing.mask = hw->settings->int_func_mask;break ;case 2 : *drdy_reg = hw->settings->int2_addr; + hw->irq_routing.addr = hw->settings->int2_func_addr; + hw->irq_routing.mask = hw->settings->int_func_mask;break ;default :dev_err (hw->dev,"unsupported data ready pin\n" );
PATCH v10 3/5 iio: imu: st_lsm6dsx: add wakeup-source option
In reply to Sean NyekjaerThis 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.
---
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(+)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +14 -0
@@ -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 ;
Signature · 1 line
2.23.0
Jonathan Cameron
maintainerRe: [PATCH v10 3/5] iio: imu: st_lsm6dsx: add wakeup-source option
Quoted 6 lines · On Mon, 16 Sep 2019 15:56:28 +0200 Sean Nyekjaer <[email protected]> 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 <[email protected]>
Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to poke it.
Thanks,
Jonathan
Quoted 63 lines
---
Changes since v4:
* More devices supports wakeupChanges since v5:
* NoneChanges since v6:
* NoneChanges since v7:
* Add check forhw->enable_event
* Moveddisable_irq_wakesection so it's called
* Removed not neeeded continue fromdisable_irq_wakesectionChanges since v8:
* Usingsensor->idinstead of i in suspend/resume loopsChanges since v9:
* Nonedrivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +14
-0@@ -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 ;
PATCH v10 4/5 iio: imu: st_lsm6dsx: always enter interrupt thread
In reply to Sean NyekjaerThe interrupt source can come from multiple sources, fifo and wake interrupts.
Enter interrupt thread to check which interrupt that has fired.
---
Changes since v8:
* Remove st_lsm6dsx_handler_irq function to enter interrupt thread at every interrupt
Changes since v9:
* None
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +1 -8
@@ -1715,13 +1715,6 @@ static struct iio_dev *st_lsm6dsx_alloc_iiodev(struct st_lsm6dsx_hw *hw,return iio_dev; } -static irqreturn_t st_lsm6dsx_handler_irq (int irq,void *private) -{ -struct st_lsm6dsx_hw *hw = private; - -return hw->sip >0 ?IRQ_WAKE_THREAD :IRQ_NONE ; -} -static irqreturn_t st_lsm6dsx_handler_thread (int irq,void *private) {struct st_lsm6dsx_hw *hw = private;
@@ -1779,7 +1772,7 @@ static int st_lsm6dsx_irq_setup(struct st_lsm6dsx_hw *hw) } err =devm_request_threaded_irq (hw->dev, hw->irq, - st_lsm6dsx_handler_irq, +NULL , st_lsm6dsx_handler_thread, irq_type |IRQF_ONESHOT ,"lsm6dsx" , hw);
Signature · 1 line
2.23.0
Jonathan Cameron
maintainerRe: [PATCH v10 4/5] iio: imu: st_lsm6dsx: always enter interrupt thread
Quoted 5 lines · On Mon, 16 Sep 2019 15:56:29 +0200 Sean Nyekjaer <[email protected]> wrote:
The interrupt source can come from multiple sources, fifo and wake interrupts.
Enter interrupt thread to check which interrupt that has fired.Signed-off-by Sean Nyekjaer <[email protected]>
Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it.
thanks,
Jonathan
Quoted 38 lines
---
Changes since v8:
* Removest_lsm6dsx_handler_irqfunction to enter interrupt thread at every interruptChanges since v9:
* Nonedrivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +1
-8@@ -1715,13 +1715,6 @@ static struct iio_dev *st_lsm6dsx_alloc_iiodev(struct st_lsm6dsx_hw *hw,return iio_dev; } -static irqreturn_t st_lsm6dsx_handler_irq (int irq,void *private) -{ -struct st_lsm6dsx_hw *hw = private; - -return hw->sip >0 ?IRQ_WAKE_THREAD :IRQ_NONE ; -} -static irqreturn_t st_lsm6dsx_handler_thread (int irq,void *private) {struct st_lsm6dsx_hw *hw = private;@@ -1779,7 +1772,7 @@ static int st_lsm6dsx_irq_setup(struct st_lsm6dsx_hw *hw) } err =devm_request_threaded_irq (hw->dev, hw->irq, - st_lsm6dsx_handler_irq, +NULL , st_lsm6dsx_handler_thread, irq_type |IRQF_ONESHOT ,"lsm6dsx" , hw);
PATCH v10 5/5 iio: imu: st_lsm6dsx: add motion report function and call from interrupt
In reply to Sean NyekjaerReport iio motion events to iio subsystem and filter motion events. Wakeup will still be on all channels as it's not possible to do the filtering in hw.
---
Changes since v4:
* Updated bitmask as pr Jonathans comments
Changes since v5:
* None
Changes since v6:
* None
Changes since v7:
* None
Changes since v8:
* None
Changes since v9:
* Merged with "iio: imu: st_lsm6dsx: filter motion events in driver"
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 5 + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 97 +++++++++++++++++++- 2 files changed, 98 insertions(+), 4 deletions(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +5 -0
@@ -186,6 +186,11 @@ struct st_lsm6dsx_shub_settings {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; };enum st_lsm6dsx_ext_sensor_id {
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +93 -4
166 lines not on this page · raw message
Signature · 1 line
2.23.0
Jonathan Cameron
maintainerRe: [PATCH v10 5/5] iio: imu: st_lsm6dsx: add motion report function and call from interrupt
Quoted 5 lines · On Mon, 16 Sep 2019 15:56:30 +0200 Sean Nyekjaer <[email protected]> wrote:
Report iio motion events to iio subsystem and filter motion events. Wakeup will still be on all channels as it's not possible to do the filtering in hw.
Signed-off-by Sean Nyekjaer <[email protected]>
*report_motion_event not declared. I've added the missing static.
Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it.
Thanks,
Jonathan
Quoted 219 lines
---
Changes since v4:
* Updated bitmask as pr Jonathans commentsChanges since v5:
* NoneChanges since v6:
* NoneChanges since v7:
* NoneChanges since v8:
* NoneChanges since v9:
* Merged with "iio: imu:st_lsm6dsx: filter motion events in driver"drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 5 + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 97 +++++++++++++++++++- 2 files changed, 98 insertions(+), 4 deletions(-)drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +5
-0@@ -186,6 +186,11 @@ struct st_lsm6dsx_shub_settings {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; };enum st_lsm6dsx_ext_sensor_id {drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +93
-4@@ -48,6 +48,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/delay.h> +#include <linux/iio/events.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> #include <linux/interrupt.h> @@ -287,6 +288,11 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .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), }, }, {@@ -412,6 +418,11 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .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), }, }, {@@ -550,6 +561,11 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .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), }, }, {@@ -816,6 +832,11 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .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), }, }, {@@ -970,6 +991,11 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .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), } }, };@@ -1334,7 +1360,7 @@ static int st_lsm6dsx_read_event_config(struct iio_dev *iio_dev,if (type !=IIO_EV_TYPE_THRESH )return -EINVAL ; -return hw->enable_event; +return !!(hw->enable_event &BIT (chan->channel2)); } static int st_lsm6dsx_write_event_config(struct iio_dev *iio_dev,@@ -1345,13 +1371,28 @@ static int st_lsm6dsx_write_event_config(struct iio_dev *iio_dev, {struct st_lsm6dsx_sensor *sensor =iio_priv (iio_dev);struct st_lsm6dsx_hw *hw = sensor->hw; +u8 enable_event;int err =0 ;if (type !=IIO_EV_TYPE_THRESH )return -EINVAL ; -/* do not enable events if they are already enabled */ -if (state && hw->enable_event) +if (state) { + enable_event = hw->enable_event |BIT (chan->channel2); + +/* do not enable events if they are already enabled */ +if (hw->enable_event) + goto out; + }else { + enable_event = hw->enable_event & ~BIT (chan->channel2); + +/* only turn off sensor if no events is enabled */ +if (enable_event) + goto out; + } + +/* stop here if no changes have been made */ +if (hw->enable_event == enable_event)return 0 ; err =st_lsm6dsx_event_setup (hw, state);@@ -1362,7 +1403,8 @@ static int st_lsm6dsx_write_event_config(struct iio_dev *iio_dev,if (err <0 )return err; - hw->enable_event = state; +out: + hw->enable_event = enable_event;return 0 ; }@@ -1715,10 +1757,57 @@ static struct iio_dev *st_lsm6dsx_alloc_iiodev(struct st_lsm6dsx_hw *hw,return iio_dev; } +void st_lsm6dsx_report_motion_event (struct st_lsm6dsx_hw *hw,int data) +{ +s64 timestamp =iio_get_time_ns (hw->iio_devs[ST_LSM6DSX_ID_ACC ]); + +if ((data & hw->settings->event_settings.wakeup_src_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 , +0 , +IIO_MOD_Z , +IIO_EV_TYPE_THRESH , +IIO_EV_DIR_EITHER ), + timestamp); + +if ((data & hw->settings->event_settings.wakeup_src_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 , +0 , +IIO_MOD_Y , +IIO_EV_TYPE_THRESH , +IIO_EV_DIR_EITHER ), + timestamp); + +if ((data & hw->settings->event_settings.wakeup_src_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 , +0 , +IIO_MOD_X , +IIO_EV_TYPE_THRESH , +IIO_EV_DIR_EITHER ), + timestamp); +} +static irqreturn_t st_lsm6dsx_handler_thread (int irq,void *private) {struct st_lsm6dsx_hw *hw = private;int count; +int data, err; + +if (hw->enable_event) { + err =regmap_read (hw->regmap, + hw->settings->event_settings.wakeup_src_reg, + &data); +if (err <0 ) +return IRQ_NONE ; + +if (data & hw->settings->event_settings.wakeup_src_status_mask) +st_lsm6dsx_report_motion_event (hw, data); + }mutex_lock (&hw->fifo_lock); count = hw->settings->fifo_ops.read_fifo (hw);
Quoted 5 lines
This prepares the interrupt to be used for other stuff than fifo reading + event readings.
Signed-off-by Sean Nyekjaer <[email protected]>Acked-by Lorenzo Bianconi <[email protected]>
for the series:
Quoted 239 lines
--- .../iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 78 +--------------- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 88 +++++++++++++++++++ 2 files changed, 89 insertions(+), 77 deletions(-)drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c +1
-77@@ -30,8 +30,6 @@* Denis Ciocca <[email protected]> */ #include <linux/module.h> -#include <linux/interrupt.h> -#include <linux/irq.h> #include <linux/iio/kfifo_buf.h> #include <linux/iio/iio.h> #include <linux/iio/buffer.h> @@ -42,10 +40,6 @@#include "st_lsm6dsx.h" -#define ST_LSM6DSX_REG_HLACTIVE_ADDR 0x12 -#define ST_LSM6DSX_REG_HLACTIVE_MASK BIT(5) -#define ST_LSM6DSX_REG_PP_OD_ADDR 0x12 -#define ST_LSM6DSX_REG_PP_OD_MASK BIT(4)#define ST_LSM6DSX_REG_FIFO_MODE_ADDR 0x0a#define ST_LSM6DSX_FIFO_MODE_MASK GENMASK(2, 0)#define ST_LSM6DSX_FIFO_ODR_MASK GENMASK(6, 3)@@ -654,25 +648,6 @@ int st_lsm6dsx_update_fifo(struct st_lsm6dsx_sensor *sensor, bool enable)return err; } -static irqreturn_t st_lsm6dsx_handler_irq (int irq,void *private) -{ -struct st_lsm6dsx_hw *hw = private; - -return hw->sip >0 ?IRQ_WAKE_THREAD :IRQ_NONE ; -} - -static irqreturn_t st_lsm6dsx_handler_thread (int irq,void *private) -{ -struct st_lsm6dsx_hw *hw = private; -int count; - -mutex_lock (&hw->fifo_lock); - count = hw->settings->fifo_ops.read_fifo (hw); -mutex_unlock (&hw->fifo_lock); - -return count ?IRQ_HANDLED :IRQ_NONE ; -} -static int st_lsm6dsx_buffer_preenable (struct iio_dev *iio_dev) {struct st_lsm6dsx_sensor *sensor =iio_priv (iio_dev);@@ -702,59 +677,8 @@ static const struct iio_buffer_setup_ops st_lsm6dsx_buffer_ops = {int st_lsm6dsx_fifo_setup (struct st_lsm6dsx_hw *hw) { -struct device_node *np = hw->dev->of_node; -struct st_sensors_platform_data *pdata;struct iio_buffer *buffer; -unsigned long irq_type; -bool irq_active_low; -int i, err; - - irq_type =irqd_get_trigger_type (irq_get_irq_data (hw->irq)); - -switch (irq_type) { -case IRQF_TRIGGER_HIGH : -case IRQF_TRIGGER_RISING : - irq_active_low = false; -break ; -case IRQF_TRIGGER_LOW : -case IRQF_TRIGGER_FALLING : - irq_active_low = true; -break ; -default : -dev_info (hw->dev,"mode %lx unsupported\n" , irq_type); -return -EINVAL ; - } - - err =regmap_update_bits (hw->regmap,ST_LSM6DSX_REG_HLACTIVE_ADDR , -ST_LSM6DSX_REG_HLACTIVE_MASK , -FIELD_PREP (ST_LSM6DSX_REG_HLACTIVE_MASK , - irq_active_low)); -if (err <0 ) -return err; - - pdata = (struct st_sensors_platform_data *)hw->dev->platform_data; -if ((np &&of_property_read_bool (np,"drive-open-drain" )) || - (pdata && pdata->open_drain)) { - err =regmap_update_bits (hw->regmap,ST_LSM6DSX_REG_PP_OD_ADDR , -ST_LSM6DSX_REG_PP_OD_MASK , -FIELD_PREP (ST_LSM6DSX_REG_PP_OD_MASK , -1 )); -if (err <0 ) -return err; - - irq_type |=IRQF_SHARED ; - } - - err =devm_request_threaded_irq (hw->dev, hw->irq, - st_lsm6dsx_handler_irq, - st_lsm6dsx_handler_thread, - irq_type |IRQF_ONESHOT , -"lsm6dsx" , hw); -if (err) { -dev_err (hw->dev,"failed to request trigger irq %d\n" , - hw->irq); -return err; - } +int i;for (i =0 ; i <ST_LSM6DSX_ID_MAX ; i++) {if (!hw->iio_devs[i])drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +88
-0@@ -50,6 +50,8 @@#include <linux/delay.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> +#include <linux/interrupt.h> +#include <linux/irq.h> #include <linux/pm.h> #include <linux/regmap.h> #include <linux/bitfield.h> @@ -65,6 +67,11 @@#define ST_LSM6DSX_REG_BDU_ADDR 0x12#define ST_LSM6DSX_REG_BDU_MASK BIT(6) +#define ST_LSM6DSX_REG_HLACTIVE_ADDR 0x12 +#define ST_LSM6DSX_REG_HLACTIVE_MASK BIT(5) +#define ST_LSM6DSX_REG_PP_OD_ADDR 0x12 +#define ST_LSM6DSX_REG_PP_OD_MASK BIT(4) +static const struct iio_chan_spec st_lsm6dsx_acc_channels[] = {ST_LSM6DSX_CHANNEL (IIO_ACCEL ,0x28 ,IIO_MOD_X ,0 ),ST_LSM6DSX_CHANNEL (IIO_ACCEL ,0x2a ,IIO_MOD_Y ,1 ),@@ -1525,6 +1532,83 @@ static struct iio_dev *st_lsm6dsx_alloc_iiodev(struct st_lsm6dsx_hw *hw,return iio_dev; } +static irqreturn_t st_lsm6dsx_handler_irq (int irq,void *private) +{ +struct st_lsm6dsx_hw *hw = private; + +return hw->sip >0 ?IRQ_WAKE_THREAD :IRQ_NONE ; +} + +static irqreturn_t st_lsm6dsx_handler_thread (int irq,void *private) +{ +struct st_lsm6dsx_hw *hw = private; +int count; + +mutex_lock (&hw->fifo_lock); + count = hw->settings->fifo_ops.read_fifo (hw); +mutex_unlock (&hw->fifo_lock); + +return count ?IRQ_HANDLED :IRQ_NONE ; +} + +static int st_lsm6dsx_irq_setup (struct st_lsm6dsx_hw *hw) +{ +struct st_sensors_platform_data *pdata; +struct device_node *np = hw->dev->of_node; +unsigned long irq_type; +bool irq_active_low; +int err; + + irq_type =irqd_get_trigger_type (irq_get_irq_data (hw->irq)); + +switch (irq_type) { +case IRQF_TRIGGER_HIGH : +case IRQF_TRIGGER_RISING : + irq_active_low = false; +break ; +case IRQF_TRIGGER_LOW : +case IRQF_TRIGGER_FALLING : + irq_active_low = true; +break ; +default : +dev_info (hw->dev,"mode %lx unsupported\n" , irq_type); +return -EINVAL ; + } + + err =regmap_update_bits (hw->regmap,ST_LSM6DSX_REG_HLACTIVE_ADDR , +ST_LSM6DSX_REG_HLACTIVE_MASK , +FIELD_PREP (ST_LSM6DSX_REG_HLACTIVE_MASK , + irq_active_low)); +if (err <0 ) +return err; + + pdata = (struct st_sensors_platform_data *)hw->dev->platform_data; +if ((np &&of_property_read_bool (np,"drive-open-drain" )) || + (pdata && pdata->open_drain)) { + err =regmap_update_bits (hw->regmap,ST_LSM6DSX_REG_PP_OD_ADDR , +ST_LSM6DSX_REG_PP_OD_MASK , +FIELD_PREP (ST_LSM6DSX_REG_PP_OD_MASK , +1 )); +if (err <0 ) +return err; + + irq_type |=IRQF_SHARED ; + } + + err =devm_request_threaded_irq (hw->dev, hw->irq, + st_lsm6dsx_handler_irq, + st_lsm6dsx_handler_thread, + irq_type |IRQF_ONESHOT , +"lsm6dsx" , hw); +if (err) { +dev_err (hw->dev,"failed to request trigger irq %d\n" , + hw->irq); +return err; + } + +return 0 ; +} +int st_lsm6dsx_probe (struct device *dev,int irq,int hw_id,struct regmap *regmap) {@@ -1573,6 +1657,10 @@ int st_lsm6dsx_probe(struct device *dev, int irq, int hw_id, }if (hw->irq >0 ) { + err =st_lsm6dsx_irq_setup (hw); +if (err <0 ) +return err; + err =st_lsm6dsx_fifo_setup (hw);if (err <0 )return err;Signature · 1 line
2.23.0
Jonathan Cameron
maintainerQuoted 5 lines · On Mon, 16 Sep 2019 15:56:26 +0200 Sean Nyekjaer <[email protected]> wrote:
This prepares the interrupt to be used for other stuff than fifo reading + event readings.
Signed-off-by Sean Nyekjaer <[email protected]>Acked-by Lorenzo Bianconi <[email protected]>
Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with them.
Thanks,
Jonathan
Quoted 236 lines
--- .../iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 78 +--------------- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 88 +++++++++++++++++++ 2 files changed, 89 insertions(+), 77 deletions(-)drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c +1
-77@@ -30,8 +30,6 @@* Denis Ciocca <[email protected]> */ #include <linux/module.h> -#include <linux/interrupt.h> -#include <linux/irq.h> #include <linux/iio/kfifo_buf.h> #include <linux/iio/iio.h> #include <linux/iio/buffer.h> @@ -42,10 +40,6 @@#include "st_lsm6dsx.h" -#define ST_LSM6DSX_REG_HLACTIVE_ADDR 0x12 -#define ST_LSM6DSX_REG_HLACTIVE_MASK BIT(5) -#define ST_LSM6DSX_REG_PP_OD_ADDR 0x12 -#define ST_LSM6DSX_REG_PP_OD_MASK BIT(4)#define ST_LSM6DSX_REG_FIFO_MODE_ADDR 0x0a#define ST_LSM6DSX_FIFO_MODE_MASK GENMASK(2, 0)#define ST_LSM6DSX_FIFO_ODR_MASK GENMASK(6, 3)@@ -654,25 +648,6 @@ int st_lsm6dsx_update_fifo(struct st_lsm6dsx_sensor *sensor, bool enable)return err; } -static irqreturn_t st_lsm6dsx_handler_irq (int irq,void *private) -{ -struct st_lsm6dsx_hw *hw = private; - -return hw->sip >0 ?IRQ_WAKE_THREAD :IRQ_NONE ; -} - -static irqreturn_t st_lsm6dsx_handler_thread (int irq,void *private) -{ -struct st_lsm6dsx_hw *hw = private; -int count; - -mutex_lock (&hw->fifo_lock); - count = hw->settings->fifo_ops.read_fifo (hw); -mutex_unlock (&hw->fifo_lock); - -return count ?IRQ_HANDLED :IRQ_NONE ; -} -static int st_lsm6dsx_buffer_preenable (struct iio_dev *iio_dev) {struct st_lsm6dsx_sensor *sensor =iio_priv (iio_dev);@@ -702,59 +677,8 @@ static const struct iio_buffer_setup_ops st_lsm6dsx_buffer_ops = {int st_lsm6dsx_fifo_setup (struct st_lsm6dsx_hw *hw) { -struct device_node *np = hw->dev->of_node; -struct st_sensors_platform_data *pdata;struct iio_buffer *buffer; -unsigned long irq_type; -bool irq_active_low; -int i, err; - - irq_type =irqd_get_trigger_type (irq_get_irq_data (hw->irq)); - -switch (irq_type) { -case IRQF_TRIGGER_HIGH : -case IRQF_TRIGGER_RISING : - irq_active_low = false; -break ; -case IRQF_TRIGGER_LOW : -case IRQF_TRIGGER_FALLING : - irq_active_low = true; -break ; -default : -dev_info (hw->dev,"mode %lx unsupported\n" , irq_type); -return -EINVAL ; - } - - err =regmap_update_bits (hw->regmap,ST_LSM6DSX_REG_HLACTIVE_ADDR , -ST_LSM6DSX_REG_HLACTIVE_MASK , -FIELD_PREP (ST_LSM6DSX_REG_HLACTIVE_MASK , - irq_active_low)); -if (err <0 ) -return err; - - pdata = (struct st_sensors_platform_data *)hw->dev->platform_data; -if ((np &&of_property_read_bool (np,"drive-open-drain" )) || - (pdata && pdata->open_drain)) { - err =regmap_update_bits (hw->regmap,ST_LSM6DSX_REG_PP_OD_ADDR , -ST_LSM6DSX_REG_PP_OD_MASK , -FIELD_PREP (ST_LSM6DSX_REG_PP_OD_MASK , -1 )); -if (err <0 ) -return err; - - irq_type |=IRQF_SHARED ; - } - - err =devm_request_threaded_irq (hw->dev, hw->irq, - st_lsm6dsx_handler_irq, - st_lsm6dsx_handler_thread, - irq_type |IRQF_ONESHOT , -"lsm6dsx" , hw); -if (err) { -dev_err (hw->dev,"failed to request trigger irq %d\n" , - hw->irq); -return err; - } +int i;for (i =0 ; i <ST_LSM6DSX_ID_MAX ; i++) {if (!hw->iio_devs[i])drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +88
-0@@ -50,6 +50,8 @@#include <linux/delay.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> +#include <linux/interrupt.h> +#include <linux/irq.h> #include <linux/pm.h> #include <linux/regmap.h> #include <linux/bitfield.h> @@ -65,6 +67,11 @@#define ST_LSM6DSX_REG_BDU_ADDR 0x12#define ST_LSM6DSX_REG_BDU_MASK BIT(6) +#define ST_LSM6DSX_REG_HLACTIVE_ADDR 0x12 +#define ST_LSM6DSX_REG_HLACTIVE_MASK BIT(5) +#define ST_LSM6DSX_REG_PP_OD_ADDR 0x12 +#define ST_LSM6DSX_REG_PP_OD_MASK BIT(4) +static const struct iio_chan_spec st_lsm6dsx_acc_channels[] = {ST_LSM6DSX_CHANNEL (IIO_ACCEL ,0x28 ,IIO_MOD_X ,0 ),ST_LSM6DSX_CHANNEL (IIO_ACCEL ,0x2a ,IIO_MOD_Y ,1 ),@@ -1525,6 +1532,83 @@ static struct iio_dev *st_lsm6dsx_alloc_iiodev(struct st_lsm6dsx_hw *hw,return iio_dev; } +static irqreturn_t st_lsm6dsx_handler_irq (int irq,void *private) +{ +struct st_lsm6dsx_hw *hw = private; + +return hw->sip >0 ?IRQ_WAKE_THREAD :IRQ_NONE ; +} + +static irqreturn_t st_lsm6dsx_handler_thread (int irq,void *private) +{ +struct st_lsm6dsx_hw *hw = private; +int count; + +mutex_lock (&hw->fifo_lock); + count = hw->settings->fifo_ops.read_fifo (hw); +mutex_unlock (&hw->fifo_lock); + +return count ?IRQ_HANDLED :IRQ_NONE ; +} + +static int st_lsm6dsx_irq_setup (struct st_lsm6dsx_hw *hw) +{ +struct st_sensors_platform_data *pdata; +struct device_node *np = hw->dev->of_node; +unsigned long irq_type; +bool irq_active_low; +int err; + + irq_type =irqd_get_trigger_type (irq_get_irq_data (hw->irq)); + +switch (irq_type) { +case IRQF_TRIGGER_HIGH : +case IRQF_TRIGGER_RISING : + irq_active_low = false; +break ; +case IRQF_TRIGGER_LOW : +case IRQF_TRIGGER_FALLING : + irq_active_low = true; +break ; +default : +dev_info (hw->dev,"mode %lx unsupported\n" , irq_type); +return -EINVAL ; + } + + err =regmap_update_bits (hw->regmap,ST_LSM6DSX_REG_HLACTIVE_ADDR , +ST_LSM6DSX_REG_HLACTIVE_MASK , +FIELD_PREP (ST_LSM6DSX_REG_HLACTIVE_MASK , + irq_active_low)); +if (err <0 ) +return err; + + pdata = (struct st_sensors_platform_data *)hw->dev->platform_data; +if ((np &&of_property_read_bool (np,"drive-open-drain" )) || + (pdata && pdata->open_drain)) { + err =regmap_update_bits (hw->regmap,ST_LSM6DSX_REG_PP_OD_ADDR , +ST_LSM6DSX_REG_PP_OD_MASK , +FIELD_PREP (ST_LSM6DSX_REG_PP_OD_MASK , +1 )); +if (err <0 ) +return err; + + irq_type |=IRQF_SHARED ; + } + + err =devm_request_threaded_irq (hw->dev, hw->irq, + st_lsm6dsx_handler_irq, + st_lsm6dsx_handler_thread, + irq_type |IRQF_ONESHOT , +"lsm6dsx" , hw); +if (err) { +dev_err (hw->dev,"failed to request trigger irq %d\n" , + hw->irq); +return err; + } + +return 0 ; +} +int st_lsm6dsx_probe (struct device *dev,int irq,int hw_id,struct regmap *regmap) {@@ -1573,6 +1657,10 @@ int st_lsm6dsx_probe(struct device *dev, int irq, int hw_id, }if (hw->irq >0 ) { + err =st_lsm6dsx_irq_setup (hw); +if (err <0 ) +return err; + err =st_lsm6dsx_fifo_setup (hw);if (err <0 )return err;