Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74f5683f authored by Giuseppe Barba's avatar Giuseppe Barba Committed by Jonathan Cameron
Browse files

iio: st_magn: Add irq trigger handling 



Add irq trigger handling for magnetometer also

Signed-off-by: default avatarGiuseppe Barba <giuseppe.barba@st.com>
Acked-by: default avatarDenis Ciocca <denis.ciocca@st.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent bb602f8c

drivers/iio/magnetometer/st_magn.h

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ void st_magn_common_remove(struct iio_dev *indio_dev); 
#ifdef CONFIG_IIO_BUFFER

int st_magn_allocate_ring(struct iio_dev *indio_dev);

void st_magn_deallocate_ring(struct iio_dev *indio_dev);

int st_magn_trig_set_state(struct iio_trigger *trig, bool state);

#define ST_MAGN_TRIGGER_SET_STATE (&st_magn_trig_set_state)

#else /* CONFIG_IIO_BUFFER */

static inline int st_magn_probe_trigger(struct iio_dev *indio_dev, int irq)

{

drivers/iio/magnetometer/st_magn_buffer.c

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,13 @@ 
#include <linux/iio/common/st_sensors.h>

#include "st_magn.h"



int st_magn_trig_set_state(struct iio_trigger *trig, bool state)

{

	struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);



	return st_sensors_set_dataready_irq(indio_dev, state);

}



static int st_magn_buffer_preenable(struct iio_dev *indio_dev)

{

	return st_sensors_set_enable(indio_dev, true);

drivers/iio/magnetometer/st_magn_core.c

+12 −1
Original line number Diff line number Diff line
@@ -480,6 +480,16 @@ static const struct iio_info magn_info = { 
	.write_raw = &st_magn_write_raw,

};



#ifdef CONFIG_IIO_TRIGGER

static const struct iio_trigger_ops st_magn_trigger_ops = {

	.owner = THIS_MODULE,

	.set_trigger_state = ST_MAGN_TRIGGER_SET_STATE,

};

#define ST_MAGN_TRIGGER_OPS (&st_magn_trigger_ops)

#else

#define ST_MAGN_TRIGGER_OPS NULL

#endif



int st_magn_common_probe(struct iio_dev *indio_dev)

{

	struct st_sensor_data *mdata = iio_priv(indio_dev);
@@ -516,7 +526,8 @@ int st_magn_common_probe(struct iio_dev *indio_dev) 
		return err;



	if (irq > 0) {

		err = st_sensors_allocate_trigger(indio_dev, NULL);

		err = st_sensors_allocate_trigger(indio_dev,

						ST_MAGN_TRIGGER_OPS);

		if (err < 0)

			goto st_magn_probe_trigger_error;

	}