From: Guillaume Stols <gstols@baylibre.com>
To: "Uwe Kleine-König" <ukleinek@kernel.org>,
"Lars-Peter Clausen" <lars@metafoo.de>,
"Michael Hennerich" <Michael.Hennerich@analog.com>,
"Jonathan Cameron" <jic23@kernel.org>,
"Rob Herring" <robh@kernel.org>,
"Krzysztof Kozlowski" <krzk+dt@kernel.org>,
"Conor Dooley" <conor+dt@kernel.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
"Jonathan Corbet" <corbet@lwn.net>
Cc: linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org,
Michael Hennerich <michael.hennerich@analog.com>,
linux-fbdev@vger.kernel.org, linux-iio@vger.kernel.org,
devicetree@vger.kernel.org, linux-doc@vger.kernel.org,
aardelean@baylibre.com, dlechner@baylibre.com,
jstephan@baylibre.com, nuno.sa@analog.com,
Jonathan Cameron <Jonathan.Cameron@huawei.com>,
Guillaume Stols <gstols@baylibre.com>
Subject: [PATCH v5 8/8] iio: adc: ad7606: Disable PWM usage for non backend version
Date: Tue, 15 Oct 2024 13:56:21 +0000 [thread overview]
Message-ID: <20241015-ad7606_add_iio_backend_support-v5-8-654faf1ae08c@baylibre.com> (raw)
In-Reply-To: <20241015-ad7606_add_iio_backend_support-v5-0-654faf1ae08c@baylibre.com>
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>
---
drivers/iio/adc/ad7606.c | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c
index 7871552ce5ac..0e830a17fc19 100644
--- a/drivers/iio/adc/ad7606.c
+++ b/drivers/iio/adc/ad7606.c
@@ -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,
--
2.34.1
next prev parent reply other threads:[~2024-10-15 13:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-15 13:56 [PATCH v5 0/8] Add iio backend compatibility for ad7606 Guillaume Stols
2024-10-15 13:56 ` [PATCH v5 1/8] dt-bindings: iio: adc: ad7606: Remove spi-cpha from required Guillaume Stols
2024-10-15 13:56 ` [PATCH v5 2/8] dt-bindings: iio: adc: ad7606: Add iio backend bindings Guillaume Stols
2024-10-15 13:56 ` [PATCH v5 3/8] Documentation: iio: Document ad7606 driver Guillaume Stols
2024-10-15 13:56 ` [PATCH v5 4/8] iio: adc: ad7606: Add PWM support for conversion trigger Guillaume Stols
2024-10-19 14:49 ` Jonathan Cameron
2024-10-15 13:56 ` [PATCH v5 5/8] iio: adc: ad7606: Add compatibility to fw_nodes Guillaume Stols
2024-10-15 13:56 ` [PATCH v5 6/8] iio: adc: ad7606: Introduce num_adc_channels Guillaume Stols
2024-10-15 13:56 ` [PATCH v5 7/8] iio: adc: ad7606: Add iio-backend support Guillaume Stols
2024-10-18 14:07 ` Guillaume Stols
2024-10-19 0:36 ` kernel test robot
2024-11-22 16:39 ` Uwe Kleine-König
2024-10-15 13:56 ` Guillaume Stols [this message]
2024-10-19 14:53 ` [PATCH v5 0/8] Add iio backend compatibility for ad7606 Jonathan Cameron
2024-10-21 13:10 ` Guillaume Stols
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241015-ad7606_add_iio_backend_support-v5-8-654faf1ae08c@baylibre.com \
--to=gstols@baylibre.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=Michael.Hennerich@analog.com \
--cc=aardelean@baylibre.com \
--cc=conor+dt@kernel.org \
--cc=corbet@lwn.net \
--cc=devicetree@vger.kernel.org \
--cc=dlechner@baylibre.com \
--cc=gregkh@linuxfoundation.org \
--cc=jic23@kernel.org \
--cc=jstephan@baylibre.com \
--cc=krzk+dt@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=nuno.sa@analog.com \
--cc=rafael@kernel.org \
--cc=robh@kernel.org \
--cc=ukleinek@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).