Merge tag 'iio-for-5.20a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[platform/kernel/linux-starfive.git] / drivers / iio / adc / stm32-adc.c

diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c
index 11ef873..130e8dd 100644 (file)
--- a/drivers/iio/adc/stm32-adc.c
+++ b/drivers/iio/adc/stm32-adc.c
@@ -876,6 +876,9 @@ static void stm32h7_adc_disable(struct iio_dev *indio_dev)
        int ret;
        u32 val;
 
+       if (!(stm32_adc_readl(adc, STM32H7_ADC_CR) & STM32H7_ADEN))
+               return;
+
        /* Disable ADC and wait until it's effectively disabled */
        stm32_adc_set_bits(adc, STM32H7_ADC_CR, STM32H7_ADDIS);
        ret = stm32_adc_readl_poll_timeout(STM32H7_ADC_CR, val,
@@ -1016,6 +1019,9 @@ static int stm32h7_adc_selfcalib(struct iio_dev *indio_dev)
        if (adc->cal.calibrated)
                return true;
 
+       /* ADC must be disabled for calibration */
+       stm32h7_adc_disable(indio_dev);
+
        /*
         * Select calibration mode:
         * - Offset calibration for single ended inputs