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

Commit fe4c5939 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'iio-fixes-for-5.4b' of... 

Merge tag 'iio-fixes-for-5.4b' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus

Second set of IIO fixes for the 5.4 cycle.

* adis16480
  - Prevent negative numbers being accepted for sampling frequency.
* inv_mpu6050
  - Fix an issue where fifo overflow bits don't actually work as expected,
    by checking the fifo count instead.
* srf04
  - Allow more time for echo to signal as some sensors supported have
    a higher range.
* stm32-adc
  - Fix a potential race in dma disable by ensuring all transfers are done.

* tag 'iio-fixes-for-5.4b' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio:
  iio: adc: stm32-adc: fix stopping dma
  iio: imu: inv_mpu6050: fix no data on MPU6050
  iio: srf04: fix wrong limitation in distance measuring
  iio: imu: adis16480: make sure provided frequency is positive
parents df402865 e6afcf6c

drivers/iio/adc/stm32-adc.c

+2 −2
Original line number Diff line number Diff line
@@ -1399,7 +1399,7 @@ static int stm32_adc_dma_start(struct iio_dev *indio_dev) 
	cookie = dmaengine_submit(desc);

	ret = dma_submit_error(cookie);

	if (ret) {

		dmaengine_terminate_all(adc->dma_chan);

		dmaengine_terminate_sync(adc->dma_chan);

		return ret;

	}
@@ -1477,7 +1477,7 @@ static void __stm32_adc_buffer_predisable(struct iio_dev *indio_dev) 
		stm32_adc_conv_irq_disable(adc);



	if (adc->dma_chan)

		dmaengine_terminate_all(adc->dma_chan);

		dmaengine_terminate_sync(adc->dma_chan);



	if (stm32_adc_set_trig(indio_dev, NULL))

		dev_err(&indio_dev->dev, "Can't clear trigger\n");

drivers/iio/imu/adis16480.c

+4 −1
Original line number Diff line number Diff line
@@ -317,8 +317,11 @@ static int adis16480_set_freq(struct iio_dev *indio_dev, int val, int val2) 
	struct adis16480 *st = iio_priv(indio_dev);

	unsigned int t, reg;



	if (val < 0 || val2 < 0)

		return -EINVAL;



	t =  val * 1000 + val2 / 1000;

	if (t <= 0)

	if (t == 0)

		return -EINVAL;



	/*

drivers/iio/imu/inv_mpu6050/inv_mpu_core.c

+9 −0
Original line number Diff line number Diff line
@@ -114,54 +114,63 @@ static const struct inv_mpu6050_hw hw_info[] = { 
		.name = "MPU6050",

		.reg = &reg_set_6050,

		.config = &chip_config_6050,

		.fifo_size = 1024,

	},

	{

		.whoami = INV_MPU6500_WHOAMI_VALUE,

		.name = "MPU6500",

		.reg = &reg_set_6500,

		.config = &chip_config_6050,

		.fifo_size = 512,

	},

	{

		.whoami = INV_MPU6515_WHOAMI_VALUE,

		.name = "MPU6515",

		.reg = &reg_set_6500,

		.config = &chip_config_6050,

		.fifo_size = 512,

	},

	{

		.whoami = INV_MPU6000_WHOAMI_VALUE,

		.name = "MPU6000",

		.reg = &reg_set_6050,

		.config = &chip_config_6050,

		.fifo_size = 1024,

	},

	{

		.whoami = INV_MPU9150_WHOAMI_VALUE,

		.name = "MPU9150",

		.reg = &reg_set_6050,

		.config = &chip_config_6050,

		.fifo_size = 1024,

	},

	{

		.whoami = INV_MPU9250_WHOAMI_VALUE,

		.name = "MPU9250",

		.reg = &reg_set_6500,

		.config = &chip_config_6050,

		.fifo_size = 512,

	},

	{

		.whoami = INV_MPU9255_WHOAMI_VALUE,

		.name = "MPU9255",

		.reg = &reg_set_6500,

		.config = &chip_config_6050,

		.fifo_size = 512,

	},

	{

		.whoami = INV_ICM20608_WHOAMI_VALUE,

		.name = "ICM20608",

		.reg = &reg_set_6500,

		.config = &chip_config_6050,

		.fifo_size = 512,

	},

	{

		.whoami = INV_ICM20602_WHOAMI_VALUE,

		.name = "ICM20602",

		.reg = &reg_set_icm20602,

		.config = &chip_config_6050,

		.fifo_size = 1008,

	},

};

drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h

+2 −0
Original line number Diff line number Diff line
@@ -100,12 +100,14 @@ struct inv_mpu6050_chip_config { 
 *  @name:      name of the chip.

 *  @reg:   register map of the chip.

 *  @config:    configuration of the chip.

 *  @fifo_size:	size of the FIFO in bytes.

 */

struct inv_mpu6050_hw {

	u8 whoami;

	u8 *name;

	const struct inv_mpu6050_reg_map *reg;

	const struct inv_mpu6050_chip_config *config;

	size_t fifo_size;

};



/*

drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c

+12 −3
Original line number Diff line number Diff line
@@ -180,9 +180,6 @@ irqreturn_t inv_mpu6050_read_fifo(int irq, void *p) 
			"failed to ack interrupt\n");

		goto flush_fifo;

	}

	/* handle fifo overflow by reseting fifo */

	if (int_status & INV_MPU6050_BIT_FIFO_OVERFLOW_INT)

		goto flush_fifo;

	if (!(int_status & INV_MPU6050_BIT_RAW_DATA_RDY_INT)) {

		dev_warn(regmap_get_device(st->map),

			"spurious interrupt with status 0x%x\n", int_status);
@@ -211,6 +208,18 @@ irqreturn_t inv_mpu6050_read_fifo(int irq, void *p) 
	if (result)

		goto end_session;

	fifo_count = get_unaligned_be16(&data[0]);



	/*

	 * Handle fifo overflow by resetting fifo.

	 * Reset if there is only 3 data set free remaining to mitigate

	 * possible delay between reading fifo count and fifo data.

	 */

	nb = 3 * bytes_per_datum;

	if (fifo_count >= st->hw->fifo_size - nb) {

		dev_warn(regmap_get_device(st->map), "fifo overflow reset\n");

		goto flush_fifo;

	}



	/* compute and process all complete datum */

	nb = fifo_count / bytes_per_datum;

	inv_mpu6050_update_period(st, pf->timestamp, nb);