diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2021-09-21 13:54:08 +0200 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2021-10-19 08:27:34 +0100 |
| commit | 089ec5e934133ca33b332d631325cdb4669a4780 (patch) | |
| tree | 01edd51fbaeb3ed13de0ddc199eb3540d1f73194 | |
| parent | 075d3280b4a135b51efd259a6ef792156b4f71a9 (diff) | |
| download | linux-089ec5e934133ca33b332d631325cdb4669a4780.tar.bz2 | |
iio: adc: max1027: Don't reject external triggers when there is no IRQ
External triggers do not necessarily need the EOC interrupt to be
populated to work properly. The end of conversion status may either come
from an interrupt or from a sufficient enough extra delay. IRQs are not
mandatory so move the triggered buffer setup out of the IRQ condition
and add the logic to wait enough time for all the requested conversions
to be in the device's FIFO.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/r/20210921115408.66711-17-miquel.raynal@bootlin.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
| -rw-r--r-- | drivers/iio/adc/max1027.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c index ba391d4438a5..fa4a2f48a36a 100644 --- a/drivers/iio/adc/max1027.c +++ b/drivers/iio/adc/max1027.c @@ -289,6 +289,9 @@ static int max1027_wait_eoc(struct iio_dev *indio_dev) if (!ret) return ret; } else { + if (indio_dev->active_scan_mask) + conversion_time *= hweight32(*indio_dev->active_scan_mask); + usleep_range(conversion_time, conversion_time * 2); } @@ -568,16 +571,18 @@ static int max1027_probe(struct spi_device *spi) if (!st->buffer) return -ENOMEM; - if (spi->irq) { - ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, - &iio_pollfunc_store_time, - &max1027_trigger_handler, - NULL); - if (ret < 0) { - dev_err(&indio_dev->dev, "Failed to setup buffer\n"); - return ret; - } + /* Enable triggered buffers */ + ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, + &iio_pollfunc_store_time, + &max1027_trigger_handler, + NULL); + if (ret < 0) { + dev_err(&indio_dev->dev, "Failed to setup buffer\n"); + return ret; + } + /* If there is an EOC interrupt, register the cnvst hardware trigger */ + if (spi->irq) { st->trig = devm_iio_trigger_alloc(&spi->dev, "%s-trigger", indio_dev->name); if (!st->trig) { |