From: Jonathan Cameron <jic23@kernel.org>
To: Benjamin Gaignard <benjamin.gaignard@linaro.org>,
linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org,
knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net,
vilhelm.gray@gmail.com, mwelling@ieee.org
Cc: fabrice.gasnier@st.com, linaro-kernel@lists.linaro.org,
Benjamin Gaignard <benjamin.gaignard@st.com>
Subject: Re: [PATCH v4 2/2] iio: stm32 trigger: Add counter enable modes
Date: Sat, 8 Apr 2017 18:28:04 +0100 [thread overview]
Message-ID: <e694dda3-7419-8240-b2c8-7b5c8dfde167@kernel.org> (raw)
In-Reply-To: <1491292072-8535-3-git-send-email-benjamin.gaignard@st.com>
On 04/04/17 08:47, Benjamin Gaignard wrote:
> Device counting could be controlled by the level or the edges of
> a trigger.
> in_count0_enable_mode attibute allow to set the control mode.
>
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@st.com>
Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.
Thanks,
Jonathan
> ---
> version 4:
> - reword triggered description
>
> .../ABI/testing/sysfs-bus-iio-timer-stm32 | 25 ++++++++
> drivers/iio/trigger/stm32-timer-trigger.c | 70 ++++++++++++++++++++++
> 2 files changed, 95 insertions(+)
>
> diff --git a/Documentation/ABI/testing/sysfs-bus-iio-timer-stm32 b/Documentation/ABI/testing/sysfs-bus-iio-timer-stm32
> index a55ad44..230020e 100644
> --- a/Documentation/ABI/testing/sysfs-bus-iio-timer-stm32
> +++ b/Documentation/ABI/testing/sysfs-bus-iio-timer-stm32
> @@ -65,3 +65,28 @@ Description:
> quadrature:
> Encoder A and B inputs are mixed to get direction
> and count with a scale of 0.25.
> +
> +What: /sys/bus/iio/devices/iio:deviceX/in_count_enable_mode_available
> +KernelVersion: 4.12
> +Contact: benjamin.gaignard@st.com
> +Description:
> + Reading returns the list possible enable modes.
> +
> +What: /sys/bus/iio/devices/iio:deviceX/in_count0_enable_mode
> +KernelVersion: 4.12
> +Contact: benjamin.gaignard@st.com
> +Description:
> + Configure the device counter enable modes, in all case
> + counting direction is set by in_count0_count_direction
> + attribute and the counter is clocked by the internal clock.
> + always:
> + Counter is always ON.
> +
> + gated:
> + Counting is enabled when connected trigger signal
> + level is high else counting is disabled.
> +
> + triggered:
> + Counting is enabled on rising edge of the connected
> + trigger, and remains enabled for the duration of this
> + selected mode.
> diff --git a/drivers/iio/trigger/stm32-timer-trigger.c b/drivers/iio/trigger/stm32-timer-trigger.c
> index 7db904c..0f1a2cf 100644
> --- a/drivers/iio/trigger/stm32-timer-trigger.c
> +++ b/drivers/iio/trigger/stm32-timer-trigger.c
> @@ -353,6 +353,74 @@ static int stm32_counter_write_raw(struct iio_dev *indio_dev,
> .write_raw = stm32_counter_write_raw
> };
>
> +static const char *const stm32_enable_modes[] = {
> + "always",
> + "gated",
> + "triggered",
> +};
> +
> +static int stm32_enable_mode2sms(int mode)
> +{
> + switch (mode) {
> + case 0:
> + return 0;
> + case 1:
> + return 5;
> + case 2:
> + return 6;
> + }
> +
> + return -EINVAL;
> +}
> +
> +static int stm32_set_enable_mode(struct iio_dev *indio_dev,
> + const struct iio_chan_spec *chan,
> + unsigned int mode)
> +{
> + struct stm32_timer_trigger *priv = iio_priv(indio_dev);
> + int sms = stm32_enable_mode2sms(mode);
> +
> + if (sms < 0)
> + return sms;
> +
> + regmap_update_bits(priv->regmap, TIM_SMCR, TIM_SMCR_SMS, sms);
> +
> + return 0;
> +}
> +
> +static int stm32_sms2enable_mode(int mode)
> +{
> + switch (mode) {
> + case 0:
> + return 0;
> + case 5:
> + return 1;
> + case 6:
> + return 2;
> + }
> +
> + return -EINVAL;
> +}
> +
> +static int stm32_get_enable_mode(struct iio_dev *indio_dev,
> + const struct iio_chan_spec *chan)
> +{
> + struct stm32_timer_trigger *priv = iio_priv(indio_dev);
> + u32 smcr;
> +
> + regmap_read(priv->regmap, TIM_SMCR, &smcr);
> + smcr &= TIM_SMCR_SMS;
> +
> + return stm32_sms2enable_mode(smcr);
> +}
> +
> +static const struct iio_enum stm32_enable_mode_enum = {
> + .items = stm32_enable_modes,
> + .num_items = ARRAY_SIZE(stm32_enable_modes),
> + .set = stm32_set_enable_mode,
> + .get = stm32_get_enable_mode
> +};
> +
> static const char *const stm32_quadrature_modes[] = {
> "channel_A",
> "channel_B",
> @@ -466,6 +534,8 @@ static ssize_t stm32_count_set_preset(struct iio_dev *indio_dev,
> IIO_ENUM_AVAILABLE("count_direction", &stm32_count_direction_enum),
> IIO_ENUM("quadrature_mode", IIO_SEPARATE, &stm32_quadrature_mode_enum),
> IIO_ENUM_AVAILABLE("quadrature_mode", &stm32_quadrature_mode_enum),
> + IIO_ENUM("enable_mode", IIO_SEPARATE, &stm32_enable_mode_enum),
> + IIO_ENUM_AVAILABLE("enable_mode", &stm32_enable_mode_enum),
> {}
> };
>
>
prev parent reply other threads:[~2017-04-08 17:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-04 7:47 [PATCH v4 0/2] iio: stm32 trigger: Add quadrature device and counter Benjamin Gaignard
2017-04-04 7:47 ` [PATCH v4 1/2] iio: stm32 trigger: Add quadrature encoder device Benjamin Gaignard
2017-04-08 17:27 ` Jonathan Cameron
2017-04-10 12:55 ` William Breathitt Gray
2017-04-14 14:10 ` Jonathan Cameron
2017-04-04 7:47 ` [PATCH v4 2/2] iio: stm32 trigger: Add counter enable modes Benjamin Gaignard
2017-04-08 17:28 ` Jonathan Cameron [this message]
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=e694dda3-7419-8240-b2c8-7b5c8dfde167@kernel.org \
--to=jic23@kernel.org \
--cc=benjamin.gaignard@linaro.org \
--cc=benjamin.gaignard@st.com \
--cc=fabrice.gasnier@st.com \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mwelling@ieee.org \
--cc=pmeerw@pmeerw.net \
--cc=vilhelm.gray@gmail.com \
/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).