From: Fabrice Gasnier <fabrice.gasnier@st.com>
To: Jonathan Cameron <jic23@kernel.org>, <linux@armlinux.org.uk>,
<robh+dt@kernel.org>, <linux-arm-kernel@lists.infradead.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <linux-iio@vger.kernel.org>, <mark.rutland@arm.com>,
<mcoquelin.stm32@gmail.com>, <alexandre.torgue@st.com>,
<lars@metafoo.de>, <knaack.h@gmx.de>, <pmeerw@pmeerw.net>,
<benjamin.gaignard@linaro.org>, <benjamin.gaignard@st.com>
Subject: Re: [PATCH 2/7] iio: adc: stm32: Enable use of stm32 timer triggers
Date: Tue, 24 Jan 2017 15:37:03 +0100 [thread overview]
Message-ID: <6e42a729-3513-5586-13dc-10cf5e90f6a3@st.com> (raw)
In-Reply-To: <9826347e-d8e4-2386-cc7a-dd2c4909494b@kernel.org>
On 01/22/2017 01:55 PM, Jonathan Cameron wrote:
> On 19/01/17 13:34, Fabrice Gasnier wrote:
>> STM32 ADC has external timer trigger sources. Use stm32 timer triggers
>> API (e.g. is_stm32_timer_trigger()) with local ADC lookup table to
>> validate a trigger can be used.
>> This also provides correct trigger selection value (e.g. extsel).
>>
>> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
> Looks good. Observations inline.
>> ---
>> drivers/iio/adc/Kconfig | 2 ++
>> drivers/iio/adc/stm32-adc.c | 60 +++++++++++++++++++++++++++++++++++++++++++++
>> 2 files changed, 62 insertions(+)
>>
>> diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
>> index 33341f4..9a7b090 100644
>> --- a/drivers/iio/adc/Kconfig
>> +++ b/drivers/iio/adc/Kconfig
>> @@ -447,6 +447,8 @@ config STM32_ADC_CORE
>> depends on OF
>> depends on REGULATOR
>> select IIO_BUFFER
>> + select MFD_STM32_TIMERS
>> + select IIO_STM32_TIMER_TRIGGER
>> select IIO_TRIGGERED_BUFFER
>> help
>> Select this option to enable the core driver for STMicroelectronics
>> diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c
>> index 8d0b74b..30708bc 100644
>> --- a/drivers/iio/adc/stm32-adc.c
>> +++ b/drivers/iio/adc/stm32-adc.c
>> @@ -23,6 +23,7 @@
>> #include <linux/delay.h>
>> #include <linux/iio/iio.h>
>> #include <linux/iio/buffer.h>
>> +#include <linux/iio/timer/stm32-timer-trigger.h>
>> #include <linux/iio/trigger.h>
>> #include <linux/iio/trigger_consumer.h>
>> #include <linux/iio/triggered_buffer.h>
>> @@ -122,6 +123,35 @@ enum stm32_adc_exten {
>> STM32_EXTEN_HWTRIG_BOTH_EDGES,
>> };
>>
>> +/* extsel - trigger mux selection value */
>> +enum stm32_adc_extsel {
>> + STM32_EXT0,
>> + STM32_EXT1,
>> + STM32_EXT2,
>> + STM32_EXT3,
>> + STM32_EXT4,
>> + STM32_EXT5,
>> + STM32_EXT6,
>> + STM32_EXT7,
>> + STM32_EXT8,
>> + STM32_EXT9,
>> + STM32_EXT10,
>> + STM32_EXT11,
>> + STM32_EXT12,
>> + STM32_EXT13,
>> + STM32_EXT14,
>> + STM32_EXT15,
>> +};
>> +
>> +/**
>> + * struct stm32_adc_trig_info - ADC trigger info
>> + * @name: name of the trigger, corresponding to its source
>> + * @extsel: trigger selection
>> + */
>> +struct stm32_adc_trig_info {
>> + const char *name;
>> + enum stm32_adc_extsel extsel;
>> +};
>>
>> /**
>> * struct stm32_adc - private data of each ADC IIO instance
>> @@ -218,6 +248,26 @@ struct stm32_adc_regs {
>> { STM32F4_ADC_SQR1, STM32F4_SQ16_MASK, STM32F4_SQ16_SHIFT },
>> };
>>
>> +/* STM32F4 external trigger sources for all instances */
>> +static struct stm32_adc_trig_info stm32f4_adc_timer_trigs[] = {
>> + { TIM1_CH1, STM32_EXT0 },
>> + { TIM1_CH2, STM32_EXT1 },
>> + { TIM1_CH3, STM32_EXT2 },
>> + { TIM2_CH2, STM32_EXT3 },
>> + { TIM2_CH3, STM32_EXT4 },
>> + { TIM2_CH4, STM32_EXT5 },
>> + { TIM2_TRGO, STM32_EXT6 },
>> + { TIM3_CH1, STM32_EXT7 },
>> + { TIM3_TRGO, STM32_EXT8 },
>> + { TIM4_CH4, STM32_EXT9 },
>> + { TIM5_CH1, STM32_EXT10 },
>> + { TIM5_CH2, STM32_EXT11 },
>> + { TIM5_CH3, STM32_EXT12 },
>> + { TIM8_CH1, STM32_EXT13 },
>> + { TIM8_TRGO, STM32_EXT14 },
>> + {}, /* sentinel */
>> +};
>> +
>> /**
>> * STM32 ADC registers access routines
>> * @adc: stm32 adc instance
>> @@ -362,6 +412,16 @@ static int stm32_adc_conf_scan_seq(struct iio_dev *indio_dev,
>> static int stm32_adc_get_trig_extsel(struct iio_dev *indio_dev,
>> struct iio_trigger *trig)
>> {
>> + int i;
> Ah. This makes more sense than patch 1 on it's own did.
>> +
>> + /* lookup triggers registered by stm32 timer trigger driver */
>> + for (i = 0; stm32f4_adc_timer_trigs[i].name; i++) {
>> + if (is_stm32_timer_trigger(trig) &&
>> + !strcmp(stm32f4_adc_timer_trigs[i].name, trig->name)) {
>> + return stm32f4_adc_timer_trigs[i].extsel;
> Good. The combination of the first check and the name match should make this safe
> against those triggers that can be assigned arbitrary names.
Do you wish I add a comment about it ?
Best Regards,
Fabrice
>> + }
>> + }
>> +
>> return -EINVAL;
>> }
>>
>>
>
next prev parent reply other threads:[~2017-01-24 14:37 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-19 13:34 [PATCH 0/7] Add support for triggered buffer mode to STM32 ADC Fabrice Gasnier
2017-01-19 13:34 ` [PATCH 1/7] iio: adc: stm32: add support for triggered buffer mode Fabrice Gasnier
2017-01-22 12:53 ` Jonathan Cameron
[not found] ` <2c683b78-6c78-3224-0646-37793deba0e9@st.com>
2017-01-28 14:02 ` Jonathan Cameron
2017-01-19 13:34 ` [PATCH 2/7] iio: adc: stm32: Enable use of stm32 timer triggers Fabrice Gasnier
2017-01-19 23:31 ` kbuild test robot
2017-01-21 12:55 ` Jonathan Cameron
2017-01-22 12:55 ` Jonathan Cameron
2017-01-24 14:37 ` Fabrice Gasnier [this message]
2017-01-28 12:46 ` Jonathan Cameron
2017-01-19 13:34 ` [PATCH 3/7] iio: adc: stm32: add trigger polarity extended attribute Fabrice Gasnier
2017-01-22 12:58 ` Jonathan Cameron
2017-01-24 14:41 ` Fabrice Gasnier
2017-01-19 13:34 ` [PATCH 4/7] Documentation: dt: iio: stm32-adc: optional dma support Fabrice Gasnier
2017-01-21 20:54 ` Rob Herring
2017-01-19 13:34 ` [PATCH 5/7] iio: adc: stm32: add " Fabrice Gasnier
2017-01-22 13:14 ` Jonathan Cameron
2017-01-24 14:43 ` Fabrice Gasnier
2017-01-24 18:25 ` Jonathan Cameron
2017-01-19 13:34 ` [PATCH 6/7] ARM: dts: stm32: Enable dma by default on stm32f4 adc Fabrice Gasnier
2017-01-19 13:34 ` [PATCH 7/7] ARM: dts: stm32: Enable pwm1 and pwm3 for stm32f469-eval Fabrice Gasnier
2017-01-20 0:09 ` kbuild test robot
2017-01-20 10:19 ` Alexandre Torgue
2017-01-20 10:36 ` Fabrice Gasnier
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=6e42a729-3513-5586-13dc-10cf5e90f6a3@st.com \
--to=fabrice.gasnier@st.com \
--cc=alexandre.torgue@st.com \
--cc=benjamin.gaignard@linaro.org \
--cc=benjamin.gaignard@st.com \
--cc=devicetree@vger.kernel.org \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=pmeerw@pmeerw.net \
--cc=robh+dt@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).