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

Commit c65e3d6e authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Jonathan Cameron
Browse files

iio: magnetometer: st_magn: fix drdy line configuration for LIS3MDL 



Data-ready line in LIS3MDL is routed to drdy pin and it is not possible
to select a different INT pin. st_sensors_set_dataready_irq() assumes
that if drdy int address is not exported in register map, irq trigger
is not supported by the sensor and hw_irq_trigger is always false.
Based on this configuration st_sensors_irq_thread does not consume
generated interrupt causing an unhandled irq.
Fix this taking into account status register address in
st_sensors_set_dataready_irq()

Fixes: 90efe055 (iio: st_sensors: harden interrupt handling)
Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@st.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 3af75db1

drivers/iio/common/st_sensors/st_sensors_core.c

+10 −1
Original line number Diff line number Diff line
@@ -463,8 +463,17 @@ int st_sensors_set_dataready_irq(struct iio_dev *indio_dev, bool enable) 
	u8 drdy_mask;

	struct st_sensor_data *sdata = iio_priv(indio_dev);



	if (!sdata->sensor_settings->drdy_irq.addr)

	if (!sdata->sensor_settings->drdy_irq.addr) {

		/*

		 * there are some devices (e.g. LIS3MDL) where drdy line is

		 * routed to a given pin and it is not possible to select a

		 * different one. Take into account irq status register

		 * to understand if irq trigger can be properly supported

		 */

		if (sdata->sensor_settings->drdy_irq.addr_stat_drdy)

			sdata->hw_irq_trigger = enable;

		return 0;

	}



	/* Enable/Disable the interrupt generator 1. */

	if (sdata->sensor_settings->drdy_irq.ig1.en_addr > 0) {

drivers/iio/magnetometer/st_magn_core.c

+4 −0
Original line number Diff line number Diff line
@@ -315,6 +315,10 @@ static const struct st_sensor_settings st_magn_sensors_settings[] = { 
				},

			},

		},

		.drdy_irq = {

			/* drdy line is routed drdy pin */

			.addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,

		},

		.multi_read_bit = true,

		.bootime = 2,

	},