From: jic23@kernel.org (Jonathan Cameron)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 6/6] iio: adc: stm32: add support for EXTI trigger
Date: Sun, 5 Mar 2017 12:21:50 +0000 [thread overview]
Message-ID: <d2f25e67-a598-3d28-01d2-f6aa277e2f67@kernel.org> (raw)
In-Reply-To: <1488300679-3259-7-git-send-email-fabrice.gasnier@st.com>
On 28/02/17 16:51, Fabrice Gasnier wrote:
> EXTi (external interrupt) signal can be routed internally as trigger
> source for ADC conversions: STM32F4 ADC can use EXTI11.
>
> Retrieve interrupt trigger from DT, so it can be muxed into ADC IP,
> via extsel.
>
> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
Minor question inline.
J
> ---
> drivers/iio/adc/stm32-adc.c | 27 ++++++++++++++++++++++++---
> 1 file changed, 24 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c
> index 9b49a6ad..4d9040d 100644
> --- a/drivers/iio/adc/stm32-adc.c
> +++ b/drivers/iio/adc/stm32-adc.c
> @@ -108,6 +108,9 @@ enum stm32_adc_extsel {
> STM32_EXT15,
> };
>
> +/* EXTI 11 trigger selection on STM32F4 */
> +#define STM32F4_EXTI11_EXTSEL STM32_EXT15
> +
> /**
> * struct stm32_adc_trig_info - ADC trigger info
> * @name: name of the trigger, corresponding to its source
> @@ -146,6 +149,7 @@ struct stm32_adc_regs {
> * @rx_buf: dma rx buffer cpu address
> * @rx_dma_buf: dma rx buffer bus address
> * @rx_buf_sz: dma rx buffer size
> + * @exti_trig EXTI trigger
> */
> struct stm32_adc {
> struct stm32_adc_common *common;
> @@ -162,6 +166,7 @@ struct stm32_adc {
> u8 *rx_buf;
> dma_addr_t rx_dma_buf;
> unsigned int rx_buf_sz;
> + struct iio_trigger *exti_trig;
> };
>
> /**
> @@ -395,10 +400,15 @@ static int stm32_adc_conf_scan_seq(struct iio_dev *indio_dev,
> *
> * Returns trigger extsel value, if trig matches, -EINVAL otherwise.
> */
> -static int stm32_adc_get_trig_extsel(struct iio_trigger *trig)
> +static int stm32_adc_get_trig_extsel(struct iio_dev *indio_dev,
> + struct iio_trigger *trig)
> {
> + struct stm32_adc *adc = iio_priv(indio_dev);
> int i;
>
> + if (trig == adc->exti_trig)
> + return STM32F4_EXTI11_EXTSEL;
> +
> /* lookup triggers registered by stm32 timer trigger driver */
> for (i = 0; stm32f4_adc_trigs[i].name; i++) {
> /**
> @@ -432,7 +442,7 @@ static int stm32_adc_set_trig(struct iio_dev *indio_dev,
> int ret;
>
> if (trig) {
> - ret = stm32_adc_get_trig_extsel(trig);
> + ret = stm32_adc_get_trig_extsel(indio_dev, trig);
> if (ret < 0)
> return ret;
>
> @@ -604,7 +614,7 @@ static irqreturn_t stm32_adc_isr(int irq, void *data)
> static int stm32_adc_validate_trigger(struct iio_dev *indio_dev,
> struct iio_trigger *trig)
> {
> - return stm32_adc_get_trig_extsel(trig) < 0 ? -EINVAL : 0;
> + return stm32_adc_get_trig_extsel(indio_dev, trig) < 0 ? -EINVAL : 0;
> }
>
> static int stm32_adc_set_watermark(struct iio_dev *indio_dev, unsigned int val)
> @@ -1030,6 +1040,17 @@ static int stm32_adc_probe(struct platform_device *pdev)
> if (ret < 0)
> goto err_clk_disable;
>
> + adc->exti_trig = devm_iio_trigger_get_by_name(&pdev->dev, "exti");
Can we tighten this in any way? If not I guess we'll have to rely on no
one messing up the devicetree to put the wrong trigger in there with this name.
> + if (IS_ERR(adc->exti_trig)) {
> + ret = PTR_ERR(adc->exti_trig);
> + if (ret == -EPROBE_DEFER)
> + goto err_dma_disable;
> + dev_dbg(&pdev->dev, "No exti trigger found (%d)\n", ret);
> + adc->exti_trig = NULL;
> + } else {
> + dev_info(&pdev->dev, "Can use %s\n", adc->exti_trig->name);
> + }
> +
> ret = iio_triggered_buffer_setup(indio_dev,
> &iio_pollfunc_store_time,
> &stm32_adc_trigger_handler,
>
next prev parent reply other threads:[~2017-03-05 12:21 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-28 16:51 [PATCH v3 0/6] Add EXTI GPIO trigger support to STM32 ADC Fabrice Gasnier
2017-02-28 16:51 ` [PATCH v3 1/6] dt-bindings: iio: introduce trigger providers, consumers Fabrice Gasnier
2017-03-03 6:21 ` Rob Herring
2017-03-03 9:32 ` Fabrice Gasnier
2017-03-05 11:45 ` Jonathan Cameron
2017-03-05 11:43 ` Jonathan Cameron
2017-03-05 12:13 ` Jonathan Cameron
2017-03-15 19:25 ` Rob Herring
2017-03-17 15:59 ` Fabrice Gasnier
2017-03-19 22:58 ` Jonathan Cameron
2017-02-28 16:51 ` [PATCH v3 2/6] iio: trigger: add OF support Fabrice Gasnier
2017-03-05 12:11 ` Jonathan Cameron
2017-03-14 15:22 ` Linus Walleij
2017-02-28 16:51 ` [PATCH v3 3/6] dt-bindings: iio: document interrupt trigger support Fabrice Gasnier
2017-03-05 12:16 ` Jonathan Cameron
2017-03-15 19:29 ` Rob Herring
2017-02-28 16:51 ` [PATCH v3 4/6] iio: iio-interrupt-trigger: device-tree support Fabrice Gasnier
2017-03-05 12:18 ` Jonathan Cameron
2017-02-28 16:51 ` [PATCH v3 5/6] dt-bindings: iio: stm32-adc: add external interrupt trigger Fabrice Gasnier
2017-02-28 16:51 ` [PATCH v3 6/6] iio: adc: stm32: add support for EXTI trigger Fabrice Gasnier
2017-03-03 11:45 ` Lars-Peter Clausen
2017-03-03 13:00 ` Fabrice Gasnier
2017-03-03 15:46 ` Lars-Peter Clausen
2017-03-03 15:47 ` Lars-Peter Clausen
2017-03-05 12:21 ` Jonathan Cameron [this message]
2017-03-05 12:28 ` Jonathan Cameron
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=d2f25e67-a598-3d28-01d2-f6aa277e2f67@kernel.org \
--to=jic23@kernel.org \
--cc=linux-arm-kernel@lists.infradead.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).