On Sun, 17 Sep 2017 17:01:02 +0200
Michał Mirosław <mirq-linux@xxxxxxxxxxxx> wrote:
> Extract reporting of motion event direction from interrupt handler,
> as it is not supported by KXTF9.
>
> Signed-off-by: Michał Mirosław <mirq-linux@xxxxxxxxxxxx>
Applied to the togreg branch of iio.git and pushed out as testing.
Thanks,
Jonathan
> ---
> drivers/iio/accel/kxcjk-1013.c | 126 ++++++++++++++++++++++-------------------
> 1 file changed, 67 insertions(+), 59 deletions(-)
>
> diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
> index 7828570d87d2..3022bc951dc2 100644
> --- a/drivers/iio/accel/kxcjk-1013.c
> +++ b/drivers/iio/accel/kxcjk-1013.c
> @@ -1032,6 +1032,72 @@ static const struct iio_trigger_ops kxcjk1013_trigger_ops = {
> .owner = THIS_MODULE,
> };
>
> +static void kxcjk1013_report_motion_event(struct iio_dev *indio_dev)
> +{
> + struct kxcjk1013_data *data = iio_priv(indio_dev);
> +
> + int ret = i2c_smbus_read_byte_data(data->client,
> + KXCJK1013_REG_INT_SRC2);
> + if (ret < 0) {
> + dev_err(&data->client->dev, "Error reading reg_int_src2\n");
> + return;
> + }
> +
> + if (ret & KXCJK1013_REG_INT_SRC2_BIT_XN)
> + iio_push_event(indio_dev,
> + IIO_MOD_EVENT_CODE(IIO_ACCEL,
> + 0,
> + IIO_MOD_X,
> + IIO_EV_TYPE_THRESH,
> + IIO_EV_DIR_FALLING),
> + data->timestamp);
> +
> + if (ret & KXCJK1013_REG_INT_SRC2_BIT_XP)
> + iio_push_event(indio_dev,
> + IIO_MOD_EVENT_CODE(IIO_ACCEL,
> + 0,
> + IIO_MOD_X,
> + IIO_EV_TYPE_THRESH,
> + IIO_EV_DIR_RISING),
> + data->timestamp);
> +
> + if (ret & KXCJK1013_REG_INT_SRC2_BIT_YN)
> + iio_push_event(indio_dev,
> + IIO_MOD_EVENT_CODE(IIO_ACCEL,
> + 0,
> + IIO_MOD_Y,
> + IIO_EV_TYPE_THRESH,
> + IIO_EV_DIR_FALLING),
> + data->timestamp);
> +
> + if (ret & KXCJK1013_REG_INT_SRC2_BIT_YP)
> + iio_push_event(indio_dev,
> + IIO_MOD_EVENT_CODE(IIO_ACCEL,
> + 0,
> + IIO_MOD_Y,
> + IIO_EV_TYPE_THRESH,
> + IIO_EV_DIR_RISING),
> + data->timestamp);
> +
> + if (ret & KXCJK1013_REG_INT_SRC2_BIT_ZN)
> + iio_push_event(indio_dev,
> + IIO_MOD_EVENT_CODE(IIO_ACCEL,
> + 0,
> + IIO_MOD_Z,
> + IIO_EV_TYPE_THRESH,
> + IIO_EV_DIR_FALLING),
> + data->timestamp);
> +
> + if (ret & KXCJK1013_REG_INT_SRC2_BIT_ZP)
> + iio_push_event(indio_dev,
> + IIO_MOD_EVENT_CODE(IIO_ACCEL,
> + 0,
> + IIO_MOD_Z,
> + IIO_EV_TYPE_THRESH,
> + IIO_EV_DIR_RISING),
> + data->timestamp);
> +}
> +
> static irqreturn_t kxcjk1013_event_handler(int irq, void *private)
> {
> struct iio_dev *indio_dev = private;
> @@ -1045,65 +1111,7 @@ static irqreturn_t kxcjk1013_event_handler(int irq, void *private)
> }
>
> if (ret & KXCJK1013_REG_INT_SRC1_BIT_WUFS) {
> - ret = i2c_smbus_read_byte_data(data->client,
> - KXCJK1013_REG_INT_SRC2);
> - if (ret < 0) {
> - dev_err(&data->client->dev,
> - "Error reading reg_int_src2\n");
> - goto ack_intr;
> - }
> -
> - if (ret & KXCJK1013_REG_INT_SRC2_BIT_XN)
> - iio_push_event(indio_dev,
> - IIO_MOD_EVENT_CODE(IIO_ACCEL,
> - 0,
> - IIO_MOD_X,
> - IIO_EV_TYPE_THRESH,
> - IIO_EV_DIR_FALLING),
> - data->timestamp);
> - if (ret & KXCJK1013_REG_INT_SRC2_BIT_XP)
> - iio_push_event(indio_dev,
> - IIO_MOD_EVENT_CODE(IIO_ACCEL,
> - 0,
> - IIO_MOD_X,
> - IIO_EV_TYPE_THRESH,
> - IIO_EV_DIR_RISING),
> - data->timestamp);
> -
> -
> - if (ret & KXCJK1013_REG_INT_SRC2_BIT_YN)
> - iio_push_event(indio_dev,
> - IIO_MOD_EVENT_CODE(IIO_ACCEL,
> - 0,
> - IIO_MOD_Y,
> - IIO_EV_TYPE_THRESH,
> - IIO_EV_DIR_FALLING),
> - data->timestamp);
> - if (ret & KXCJK1013_REG_INT_SRC2_BIT_YP)
> - iio_push_event(indio_dev,
> - IIO_MOD_EVENT_CODE(IIO_ACCEL,
> - 0,
> - IIO_MOD_Y,
> - IIO_EV_TYPE_THRESH,
> - IIO_EV_DIR_RISING),
> - data->timestamp);
> -
> - if (ret & KXCJK1013_REG_INT_SRC2_BIT_ZN)
> - iio_push_event(indio_dev,
> - IIO_MOD_EVENT_CODE(IIO_ACCEL,
> - 0,
> - IIO_MOD_Z,
> - IIO_EV_TYPE_THRESH,
> - IIO_EV_DIR_FALLING),
> - data->timestamp);
> - if (ret & KXCJK1013_REG_INT_SRC2_BIT_ZP)
> - iio_push_event(indio_dev,
> - IIO_MOD_EVENT_CODE(IIO_ACCEL,
> - 0,
> - IIO_MOD_Z,
> - IIO_EV_TYPE_THRESH,
> - IIO_EV_DIR_RISING),
> - data->timestamp);
> + kxcjk1013_report_motion_event(indio_dev);
> }
>
> ack_intr:
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
