aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iio/adc
diff options
context:
space:
mode:
authorPhilippe Schenker <philippe.schenker@toradex.com>2019-05-07 16:36:15 +0200
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2019-05-11 11:18:34 +0100
commited1f310ee23d277d5386f532165911df69afe62f (patch)
tree65768adf1d06700eb5bdd5be4430a9ec3db804e2 /drivers/iio/adc
parentiio: stmpe-adc: Use wait_for_completion_timeout (diff)
downloadlinux-dev-ed1f310ee23d277d5386f532165911df69afe62f.tar.xz
linux-dev-ed1f310ee23d277d5386f532165911df69afe62f.zip
iio: stmpe-adc: Reset possible interrupts
Clear any interrupt that still is on the device on every channel this driver is activated for in probe and specific channels in the timeout handler. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/iio/adc')
-rw-r--r--drivers/iio/adc/stmpe-adc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/iio/adc/stmpe-adc.c b/drivers/iio/adc/stmpe-adc.c
index 40a4648f0bc5..bd72727fc417 100644
--- a/drivers/iio/adc/stmpe-adc.c
+++ b/drivers/iio/adc/stmpe-adc.c
@@ -80,6 +80,8 @@ static int stmpe_read_voltage(struct stmpe_adc *info,
ret = wait_for_completion_timeout(&info->completion, STMPE_ADC_TIMEOUT);
if (ret <= 0) {
+ stmpe_reg_write(info->stmpe, STMPE_REG_ADC_INT_STA,
+ STMPE_ADC_CH(info->channel));
mutex_unlock(&info->lock);
return -ETIMEDOUT;
}
@@ -325,6 +327,9 @@ static int stmpe_adc_probe(struct platform_device *pdev)
stmpe_reg_write(info->stmpe, STMPE_REG_ADC_INT_EN,
~(norequest_mask & 0xFF));
+ stmpe_reg_write(info->stmpe, STMPE_REG_ADC_INT_STA,
+ ~(norequest_mask & 0xFF));
+
return devm_iio_device_register(&pdev->dev, indio_dev);
}