iio: adc: ad7606: Disable PWM usage for non backend version
authorGuillaume Stols <gstols@baylibre.com>
Tue, 15 Oct 2024 13:56:21 +0000 (13:56 +0000)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 21 Oct 2024 18:19:26 +0000 (19:19 +0100)
Since the pwm was introduced before backend, there was a mock use, with
a GPIO emulation. Now that iio backend is introduced, the mock use can
be removed.

Signed-off-by: Guillaume Stols <gstols@baylibre.com>
Link: https://patch.msgid.link/20241015-ad7606_add_iio_backend_support-v5-8-654faf1ae08c@baylibre.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/ad7606.c

index 7953ea5..0e830a1 100644 (file)
@@ -470,8 +470,6 @@ static int ad7606_pwm_set_high(struct ad7606_state *st)
        cnvst_pwm_state.duty_cycle = cnvst_pwm_state.period;
 
        ret = pwm_apply_might_sleep(st->cnvst_pwm, &cnvst_pwm_state);
-       /* sleep 2 µS to let finish the current pulse */
-       fsleep(2);
 
        return ret;
 }
@@ -486,8 +484,6 @@ static int ad7606_pwm_set_low(struct ad7606_state *st)
        cnvst_pwm_state.duty_cycle = 0;
 
        ret = pwm_apply_might_sleep(st->cnvst_pwm, &cnvst_pwm_state);
-       /* sleep 2 µS to let finish the current pulse */
-       fsleep(2);
 
        return ret;
 }
@@ -563,13 +559,7 @@ static irqreturn_t ad7606_trigger_handler(int irq, void *p)
 error_ret:
        iio_trigger_notify_done(indio_dev->trig);
        /* The rising edge of the CONVST signal starts a new conversion. */
-       if (st->gpio_convst) {
-               gpiod_set_value(st->gpio_convst, 1);
-       } else {
-               ret = ad7606_pwm_set_high(st);
-               if (ret < 0)
-                       dev_err(st->dev, "Could not set PWM to high.");
-       }
+       gpiod_set_value(st->gpio_convst, 1);
 
        return IRQ_HANDLED;
 }
@@ -900,10 +890,7 @@ static int ad7606_buffer_postenable(struct iio_dev *indio_dev)
 {
        struct ad7606_state *st = iio_priv(indio_dev);
 
-       if (st->gpio_convst)
-               gpiod_set_value(st->gpio_convst, 1);
-       else
-               return ad7606_pwm_set_high(st);
+       gpiod_set_value(st->gpio_convst, 1);
 
        return 0;
 }
@@ -912,10 +899,7 @@ static int ad7606_buffer_predisable(struct iio_dev *indio_dev)
 {
        struct ad7606_state *st = iio_priv(indio_dev);
 
-       if (st->gpio_convst)
-               gpiod_set_value(st->gpio_convst, 0);
-       else
-               return ad7606_pwm_set_low(st);
+       gpiod_set_value(st->gpio_convst, 0);
 
        return 0;
 }
@@ -1210,6 +1194,12 @@ int ad7606_probe(struct device *dev, int irq, void __iomem *base_address,
 
                indio_dev->setup_ops = &ad7606_backend_buffer_ops;
        } else {
+
+               /* Reserve the PWM use only for backend (force gpio_convst definition) */
+               if (!st->gpio_convst)
+                       return dev_err_probe(dev, -EINVAL,
+                                            "No backend, connect convst to a GPIO");
+
                init_completion(&st->completion);
                st->trig = devm_iio_trigger_alloc(dev, "%s-dev%d",
                                                  indio_dev->name,