From: Jonathan Cameron <jic23@kernel.org>
To: Fabrice Gasnier <fabrice.gasnier@st.com>
Cc: <linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <mcoquelin.stm32@gmail.com>,
<alexandre.torgue@st.com>, <linux-iio@vger.kernel.org>,
<lars@metafoo.de>, <knaack.h@gmx.de>, <pmeerw@pmeerw.net>,
<benjamin.gaignard@linaro.org>, <arnaud.pouliquen@st.com>
Subject: Re: [PATCH 3/7] iio: adc: stm32-dfsdm: fix clock source selection
Date: Sat, 24 Feb 2018 12:59:47 +0000 [thread overview]
Message-ID: <20180224125947.5c5734a9@archlinux> (raw)
In-Reply-To: <1519390261-25453-4-git-send-email-fabrice.gasnier@st.com>
On Fri, 23 Feb 2018 13:50:57 +0100
Fabrice Gasnier <fabrice.gasnier@st.com> wrote:
> Add missing clock source selection. In case "audio" clock is provided,
> it's unused currently: "dfsdm" clock is wrongly used by default.
>
> Fixes: bed73904e76f ("IIO: ADC: add stm32 DFSDM core support")
>
> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
Applied to the fixes-togreg branch of iio.git.
Thanks,
Jonathan
> ---
> drivers/iio/adc/stm32-dfsdm-core.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/adc/stm32-dfsdm-core.c b/drivers/iio/adc/stm32-dfsdm-core.c
> index 0635f93..e50efdc 100644
> --- a/drivers/iio/adc/stm32-dfsdm-core.c
> +++ b/drivers/iio/adc/stm32-dfsdm-core.c
> @@ -83,7 +83,7 @@ int stm32_dfsdm_start_dfsdm(struct stm32_dfsdm *dfsdm)
> {
> struct dfsdm_priv *priv = container_of(dfsdm, struct dfsdm_priv, dfsdm);
> struct device *dev = &priv->pdev->dev;
> - unsigned int clk_div = priv->spi_clk_out_div;
> + unsigned int clk_div = priv->spi_clk_out_div, clk_src;
> int ret;
>
> if (atomic_inc_return(&priv->n_active_ch) == 1) {
> @@ -100,6 +100,14 @@ int stm32_dfsdm_start_dfsdm(struct stm32_dfsdm *dfsdm)
> }
> }
>
> + /* select clock source, e.g. 0 for "dfsdm" or 1 for "audio" */
> + clk_src = priv->aclk ? 1 : 0;
> + ret = regmap_update_bits(dfsdm->regmap, DFSDM_CHCFGR1(0),
> + DFSDM_CHCFGR1_CKOUTSRC_MASK,
> + DFSDM_CHCFGR1_CKOUTSRC(clk_src));
> + if (ret < 0)
> + goto disable_aclk;
> +
> /* Output the SPI CLKOUT (if clk_div == 0 clock if OFF) */
> ret = regmap_update_bits(dfsdm->regmap, DFSDM_CHCFGR1(0),
> DFSDM_CHCFGR1_CKOUTDIV_MASK,
WARNING: multiple messages have this Message-ID (diff)
From: jic23@kernel.org (Jonathan Cameron)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/7] iio: adc: stm32-dfsdm: fix clock source selection
Date: Sat, 24 Feb 2018 12:59:47 +0000 [thread overview]
Message-ID: <20180224125947.5c5734a9@archlinux> (raw)
In-Reply-To: <1519390261-25453-4-git-send-email-fabrice.gasnier@st.com>
On Fri, 23 Feb 2018 13:50:57 +0100
Fabrice Gasnier <fabrice.gasnier@st.com> wrote:
> Add missing clock source selection. In case "audio" clock is provided,
> it's unused currently: "dfsdm" clock is wrongly used by default.
>
> Fixes: bed73904e76f ("IIO: ADC: add stm32 DFSDM core support")
>
> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
Applied to the fixes-togreg branch of iio.git.
Thanks,
Jonathan
> ---
> drivers/iio/adc/stm32-dfsdm-core.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/adc/stm32-dfsdm-core.c b/drivers/iio/adc/stm32-dfsdm-core.c
> index 0635f93..e50efdc 100644
> --- a/drivers/iio/adc/stm32-dfsdm-core.c
> +++ b/drivers/iio/adc/stm32-dfsdm-core.c
> @@ -83,7 +83,7 @@ int stm32_dfsdm_start_dfsdm(struct stm32_dfsdm *dfsdm)
> {
> struct dfsdm_priv *priv = container_of(dfsdm, struct dfsdm_priv, dfsdm);
> struct device *dev = &priv->pdev->dev;
> - unsigned int clk_div = priv->spi_clk_out_div;
> + unsigned int clk_div = priv->spi_clk_out_div, clk_src;
> int ret;
>
> if (atomic_inc_return(&priv->n_active_ch) == 1) {
> @@ -100,6 +100,14 @@ int stm32_dfsdm_start_dfsdm(struct stm32_dfsdm *dfsdm)
> }
> }
>
> + /* select clock source, e.g. 0 for "dfsdm" or 1 for "audio" */
> + clk_src = priv->aclk ? 1 : 0;
> + ret = regmap_update_bits(dfsdm->regmap, DFSDM_CHCFGR1(0),
> + DFSDM_CHCFGR1_CKOUTSRC_MASK,
> + DFSDM_CHCFGR1_CKOUTSRC(clk_src));
> + if (ret < 0)
> + goto disable_aclk;
> +
> /* Output the SPI CLKOUT (if clk_div == 0 clock if OFF) */
> ret = regmap_update_bits(dfsdm->regmap, DFSDM_CHCFGR1(0),
> DFSDM_CHCFGR1_CKOUTDIV_MASK,
next prev parent reply other threads:[~2018-02-24 12:59 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-23 12:50 [PATCH 0/7] iio: adc: stm32-dfsdm: misc fixes and improvements Fabrice Gasnier
2018-02-23 12:50 ` Fabrice Gasnier
2018-02-23 12:50 ` [PATCH 1/7] iio: adc: stm32-dfsdm: fix compatible data use Fabrice Gasnier
2018-02-23 12:50 ` Fabrice Gasnier
2018-02-24 12:56 ` Jonathan Cameron
2018-02-24 12:56 ` Jonathan Cameron
2018-02-23 12:50 ` [PATCH 2/7] iio: adc: stm32-dfsdm: fix call to stop channel Fabrice Gasnier
2018-02-23 12:50 ` Fabrice Gasnier
2018-02-24 12:57 ` Jonathan Cameron
2018-02-24 12:57 ` Jonathan Cameron
2018-02-23 12:50 ` [PATCH 3/7] iio: adc: stm32-dfsdm: fix clock source selection Fabrice Gasnier
2018-02-23 12:50 ` Fabrice Gasnier
2018-02-24 12:59 ` Jonathan Cameron [this message]
2018-02-24 12:59 ` Jonathan Cameron
2018-02-23 12:50 ` [PATCH 4/7] iio: adc: stm32-dfsdm: fix multiple channel initialization Fabrice Gasnier
2018-02-23 12:50 ` Fabrice Gasnier
2018-02-24 13:01 ` Jonathan Cameron
2018-02-24 13:01 ` Jonathan Cameron
2018-02-23 12:50 ` [PATCH 5/7] iio: adc: stm32-dfsdm: misc style improvements and fixes Fabrice Gasnier
2018-02-23 12:50 ` Fabrice Gasnier
2018-02-24 13:03 ` Jonathan Cameron
2018-02-24 13:03 ` Jonathan Cameron
2018-02-27 8:21 ` Fabrice Gasnier
2018-02-27 8:21 ` Fabrice Gasnier
2018-03-03 15:09 ` Jonathan Cameron
2018-03-03 15:09 ` Jonathan Cameron
2018-04-23 7:48 ` Fabrice Gasnier
2018-04-23 7:48 ` Fabrice Gasnier
2018-04-28 14:52 ` Jonathan Cameron
2018-04-28 14:52 ` Jonathan Cameron
2018-02-23 12:51 ` [PATCH 6/7] iio: adc: stm32-dfsdm: add check on max filter id Fabrice Gasnier
2018-02-23 12:51 ` Fabrice Gasnier
2018-04-28 15:07 ` Jonathan Cameron
2018-04-28 15:07 ` Jonathan Cameron
2018-02-23 12:51 ` [PATCH 7/7] iio: adc: stm32-dfsdm: add check on spi-max-frequency Fabrice Gasnier
2018-02-23 12:51 ` Fabrice Gasnier
2018-04-28 15:07 ` Jonathan Cameron
2018-04-28 15:07 ` Jonathan Cameron
2018-02-23 13:49 ` [PATCH 0/7] iio: adc: stm32-dfsdm: misc fixes and improvements Arnaud Pouliquen
2018-02-23 13:49 ` Arnaud Pouliquen
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=20180224125947.5c5734a9@archlinux \
--to=jic23@kernel.org \
--cc=alexandre.torgue@st.com \
--cc=arnaud.pouliquen@st.com \
--cc=benjamin.gaignard@linaro.org \
--cc=fabrice.gasnier@st.com \
--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=mcoquelin.stm32@gmail.com \
--cc=pmeerw@pmeerw.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.