From: Chen-Yu Tsai <wens@csie.org>
To: Code Kipper <codekipper@gmail.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
linux-sunxi <linux-sunxi@googlegroups.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
Linux-ALSA <alsa-devel@alsa-project.org>,
"Andrea Venturi (pers)" <be17068@iperbole.bo.it>
Subject: Re: [linux-sunxi] [PATCH v3 08/12] ASoC: sun4i-i2s: Add mclk enable regmap field
Date: Wed, 2 Aug 2017 11:20:27 +0800 [thread overview]
Message-ID: <CAGb2v65FRyp_2BfhReZF5zbqxxX2w3gzpnLLHXOJoDCt5j_a9w@mail.gmail.com> (raw)
In-Reply-To: <20170729141753.20174-9-codekipper@gmail.com>
On Sat, Jul 29, 2017 at 10:17 PM, <codekipper@gmail.com> wrote:
> From: Marcus Cooper <codekipper@gmail.com>
>
> The location of the mclk output enable bit is different on newer
> SoCs. Use a regmap field to enable it.
>
> Signed-off-by: Marcus Cooper <codekipper@gmail.com>
> ---
> sound/soc/sunxi/sun4i-i2s.c | 22 +++++++++++++++++++---
> 1 file changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
> index 90daa974bd27..6d8d2c4a675b 100644
> --- a/sound/soc/sunxi/sun4i-i2s.c
> +++ b/sound/soc/sunxi/sun4i-i2s.c
> @@ -74,7 +74,7 @@
> #define SUN4I_I2S_INT_STA_REG 0x20
>
> #define SUN4I_I2S_CLK_DIV_REG 0x24
> -#define SUN4I_I2S_CLK_DIV_MCLK_EN BIT(7)
> +#define SUN4I_I2S_CLK_DIV_MCLK_EN 7
> #define SUN4I_I2S_CLK_DIV_BCLK_MASK GENMASK(6, 4)
> #define SUN4I_I2S_CLK_DIV_BCLK(bclk) ((bclk) << 4)
> #define SUN4I_I2S_CLK_DIV_MCLK_MASK GENMASK(3, 0)
> @@ -101,6 +101,7 @@
> * @mclk_offset: Value by which mclkdiv needs to be adjusted.
> * @bclk_offset: Value by which bclkdiv needs to be adjusted.
> * @fmt_offset: Value by which wss and sr needs to be adjusted.
> + * @field_clkdiv_mclk_en: regmap field to enable mclk output.
> * @field_fmt_set_wss: regmap field to set word select size.
> * @field_fmt_set_sr: regmap field to set sample resolution.
> * @field_fmt_set_bclk_polarity: regmap field to set clk polarity.
> @@ -119,6 +120,7 @@ struct sun4i_i2s_quirks {
> unsigned int fmt_offset;
>
> /* Register fields for i2s */
> + struct reg_field field_clkdiv_mclk_en;
> struct reg_field field_fmt_set_wss;
> struct reg_field field_fmt_set_sr;
> struct reg_field field_fmt_set_bclk_polarity;
> @@ -141,6 +143,7 @@ struct sun4i_i2s {
> struct snd_dmaengine_dai_dma_data playback_dma_data;
>
> /* Register fields for i2s */
> + struct regmap_field *field_clkdiv_mclk_en;
> struct regmap_field *field_fmt_set_wss;
> struct regmap_field *field_fmt_set_sr;
> struct regmap_field *field_fmt_set_bclk_polarity;
> @@ -279,8 +282,9 @@ static int sun4i_i2s_set_clk_rate(struct sun4i_i2s *i2s,
>
> regmap_write(i2s->regmap, SUN4I_I2S_CLK_DIV_REG,
> SUN4I_I2S_CLK_DIV_BCLK(bclk_div) |
> - SUN4I_I2S_CLK_DIV_MCLK(mclk_div) |
> - SUN4I_I2S_CLK_DIV_MCLK_EN);
> + SUN4I_I2S_CLK_DIV_MCLK(mclk_div));
> +
> + regmap_field_write(i2s->field_clkdiv_mclk_en, 1);
>
> return 0;
> }
> @@ -710,6 +714,9 @@ static const struct sun4i_i2s_quirks sun4i_a10_i2s_quirks = {
> .has_reset = false,
> .reg_offset_txdata = SUN4I_I2S_FIFO_TX_REG,
> .sun4i_i2s_regmap = &sun4i_i2s_regmap_config,
> + .field_clkdiv_mclk_en = REG_FIELD(SUN4I_I2S_CLK_DIV_REG,
> + SUN4I_I2S_CLK_DIV_MCLK_EN,
> + SUN4I_I2S_CLK_DIV_MCLK_EN),
Nit: just use raw number to match all the other lines. And you won't
need to change the macro.
ChenYu
next prev parent reply other threads:[~2017-08-02 3:20 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-29 14:17 [PATCH v3 00/12] ASoC: Add I2S support for Allwinner H3 SoCs codekipper
2017-07-29 14:17 ` [PATCH v3 01/12] ASoC: sun4i-i2s: Extend quirks scope codekipper
2017-08-01 2:50 ` [linux-sunxi] " Chen-Yu Tsai
2017-08-01 14:16 ` Applied "ASoC: sun4i-i2s: Extend quirks scope" to the asoc tree Mark Brown
2017-07-29 14:17 ` [PATCH v3 02/12] ASoC: sun4i-i2s: Add clkdiv offsets to quirks codekipper
2017-08-01 2:55 ` [linux-sunxi] " Chen-Yu Tsai
2017-08-07 6:20 ` Code Kipper
2017-07-29 14:17 ` [PATCH v3 03/12] ASoC: sun4i-i2s: Add regmap config " codekipper
2017-08-01 8:10 ` [linux-sunxi] " Chen-Yu Tsai
2017-08-14 16:43 ` Applied "ASoC: sun4i-i2s: Add regmap config to quirks" to the asoc tree Mark Brown
2017-07-29 14:17 ` [PATCH v3 04/12] ASoC: sun4i-i2s: Add TX FIFO offset to quirks codekipper
2017-08-01 8:18 ` [linux-sunxi] " Chen-Yu Tsai
2017-08-14 16:43 ` Applied "ASoC: sun4i-i2s: Add TX FIFO offset to quirks" to the asoc tree Mark Brown
2017-07-29 14:17 ` [PATCH v3 05/12] ASoC: sun4i-i2s: Add regmap fields for channels codekipper
2017-07-30 16:43 ` [alsa-devel] " kbuild test robot
2017-07-30 16:43 ` [PATCH] ASoC: sun4i-i2s: fix ptr_ret.cocci warnings kbuild test robot
2017-08-01 8:31 ` [linux-sunxi] [PATCH v3 05/12] ASoC: sun4i-i2s: Add regmap fields for channels Chen-Yu Tsai
2017-08-07 7:39 ` Code Kipper
2017-07-29 14:17 ` [PATCH v3 06/12] ASoC: sun4i-i2s: Add changes for wss and sr codekipper
2017-08-01 8:49 ` [linux-sunxi] " Chen-Yu Tsai
2017-08-02 3:06 ` Chen-Yu Tsai
2017-07-29 14:17 ` [PATCH v3 07/12] ASoC: sun4i-i2s: bclk and lrclk polarity tidyup codekipper
2017-08-02 3:09 ` [linux-sunxi] " Chen-Yu Tsai
2017-07-29 14:17 ` [PATCH v3 08/12] ASoC: sun4i-i2s: Add mclk enable regmap field codekipper
2017-08-02 3:20 ` Chen-Yu Tsai [this message]
2017-07-29 14:17 ` [PATCH v3 09/12] ASoC: sun4i-i2s: Add regmap field to set format codekipper
2017-08-02 3:32 ` [linux-sunxi] " Chen-Yu Tsai
2017-07-29 14:17 ` [PATCH v3 10/12] ASoC: sun4i-i2s: Check for slave select bit codekipper
2017-08-02 3:50 ` [linux-sunxi] " Chen-Yu Tsai
2017-07-29 14:17 ` [PATCH v3 11/12] ASoC: sun4i-i2s: Update global enable with bitmask codekipper
2017-08-02 3:55 ` [linux-sunxi] " Chen-Yu Tsai
2017-07-29 14:17 ` [PATCH v3 12/12] ASoC: sun4i-i2s: Add support for H3 codekipper
2017-08-02 4:37 ` [linux-sunxi] " Chen-Yu Tsai
2017-07-31 7:05 ` [linux-sunxi] [PATCH v3 00/12] ASoC: Add I2S support for Allwinner H3 SoCs Olliver Schinagl
2017-07-31 14:22 ` Code Kipper
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=CAGb2v65FRyp_2BfhReZF5zbqxxX2w3gzpnLLHXOJoDCt5j_a9w@mail.gmail.com \
--to=wens@csie.org \
--cc=alsa-devel@alsa-project.org \
--cc=be17068@iperbole.bo.it \
--cc=broonie@kernel.org \
--cc=codekipper@gmail.com \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=maxime.ripard@free-electrons.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).