> This prepares the interrupt to be used for other stuff than
> fifo reading + event readings.
>
> Signed-off-by: Sean Nyekjaer <sean@xxxxxxxxxx>
> ---
> Changes since v1:
> * none
> Changes since v2:
> * none
>
> .../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(-)
Hi Sean,
just a couple of nitpick inline (they can be addressed even in a follow up
patch)
Regards,
Lorenzo
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
> index b0f3da1976e4..ef579650fd52 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
> @@ -30,8 +30,6 @@
> * Denis Ciocca <denis.ciocca@xxxxxx>
> */
> #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"
[...]
> +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;
> +}
> +
> +int st_lsm6dsx_irq_setup(struct st_lsm6dsx_hw *hw)
it can be static
> +{
> + 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 err;
return 0 here or remove the previous one
> +}
> +
> int st_lsm6dsx_probe(struct device *dev, int irq, int hw_id,
> struct regmap *regmap)
> {
> @@ -1514,6 +1598,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;
> --
> 2.23.0
>
Attachment:
signature.asc
Description: PGP signature
