From: Maxime Ripard <maxime@cerno.tech>
To: Samuel Holland <samuel@sholland.org>
Cc: Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>, Chen-Yu Tsai <wens@csie.org>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Ondrej Jirman <megous@megous.com>,
alsa-devel@alsa-project.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 23/25] ASoC: sun8i-codec: Generalize AIF clock control
Date: Mon, 5 Oct 2020 14:04:59 +0200 [thread overview]
Message-ID: <20201005120459.5w5ligbconuwnzdv@gilmour.lan> (raw)
In-Reply-To: <20201001021148.15852-24-samuel@sholland.org>
[-- Attachment #1: Type: text/plain, Size: 4668 bytes --]
Hi,
On Wed, Sep 30, 2020 at 09:11:46PM -0500, Samuel Holland wrote:
> The AIF clock control register has the same layout for all three AIFs.
> The only difference between them is that AIF3 is missing some fields. We
> can reuse the same register field definitions for all three registers,
> and use the DAI ID to select the correct register address.
>
> Signed-off-by: Samuel Holland <samuel@sholland.org>
> ---
> sound/soc/sunxi/sun8i-codec.c | 64 +++++++++++++++++++----------------
> 1 file changed, 34 insertions(+), 30 deletions(-)
>
> diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
> index 032a3f714dbb..1c34502ac47a 100644
> --- a/sound/soc/sunxi/sun8i-codec.c
> +++ b/sound/soc/sunxi/sun8i-codec.c
> @@ -37,23 +37,23 @@
> #define SUN8I_MOD_CLK_ENA_DAC 2
> #define SUN8I_MOD_RST_CTL 0x014
> #define SUN8I_MOD_RST_CTL_AIF1 15
> #define SUN8I_MOD_RST_CTL_ADC 3
> #define SUN8I_MOD_RST_CTL_DAC 2
> #define SUN8I_SYS_SR_CTRL 0x018
> #define SUN8I_SYS_SR_CTRL_AIF1_FS 12
> #define SUN8I_SYS_SR_CTRL_AIF2_FS 8
> -#define SUN8I_AIF1CLK_CTRL 0x040
> -#define SUN8I_AIF1CLK_CTRL_AIF1_MSTR_MOD 15
> -#define SUN8I_AIF1CLK_CTRL_AIF1_CLK_INV 13
> -#define SUN8I_AIF1CLK_CTRL_AIF1_BCLK_DIV 9
> -#define SUN8I_AIF1CLK_CTRL_AIF1_LRCK_DIV 6
> -#define SUN8I_AIF1CLK_CTRL_AIF1_WORD_SIZ 4
> -#define SUN8I_AIF1CLK_CTRL_AIF1_DATA_FMT 2
> +#define SUN8I_AIF_CLK_CTRL(n) (0x040 * (1 + (n)))
> +#define SUN8I_AIF_CLK_CTRL_MSTR_MOD 15
> +#define SUN8I_AIF_CLK_CTRL_CLK_INV 13
> +#define SUN8I_AIF_CLK_CTRL_BCLK_DIV 9
> +#define SUN8I_AIF_CLK_CTRL_LRCK_DIV 6
> +#define SUN8I_AIF_CLK_CTRL_WORD_SIZ 4
> +#define SUN8I_AIF_CLK_CTRL_DATA_FMT 2
> #define SUN8I_AIF1_ADCDAT_CTRL 0x044
> #define SUN8I_AIF1_ADCDAT_CTRL_AIF1_AD0L_ENA 15
> #define SUN8I_AIF1_ADCDAT_CTRL_AIF1_AD0R_ENA 14
> #define SUN8I_AIF1_ADCDAT_CTRL_AIF1_AD0L_SRC 10
> #define SUN8I_AIF1_ADCDAT_CTRL_AIF1_AD0R_SRC 8
> #define SUN8I_AIF1_DACDAT_CTRL 0x048
> #define SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA 15
> #define SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA 14
> @@ -83,21 +83,21 @@
> #define SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA1R 10
> #define SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF2DACR 9
> #define SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_ADCR 8
>
> #define SUN8I_SYSCLK_CTL_AIF1CLK_SRC_MASK GENMASK(9, 8)
> #define SUN8I_SYSCLK_CTL_AIF2CLK_SRC_MASK GENMASK(5, 4)
> #define SUN8I_SYS_SR_CTRL_AIF1_FS_MASK GENMASK(15, 12)
> #define SUN8I_SYS_SR_CTRL_AIF2_FS_MASK GENMASK(11, 8)
> -#define SUN8I_AIF1CLK_CTRL_AIF1_CLK_INV_MASK GENMASK(14, 13)
> -#define SUN8I_AIF1CLK_CTRL_AIF1_BCLK_DIV_MASK GENMASK(12, 9)
> -#define SUN8I_AIF1CLK_CTRL_AIF1_LRCK_DIV_MASK GENMASK(8, 6)
> -#define SUN8I_AIF1CLK_CTRL_AIF1_WORD_SIZ_MASK GENMASK(5, 4)
> -#define SUN8I_AIF1CLK_CTRL_AIF1_DATA_FMT_MASK GENMASK(3, 2)
> +#define SUN8I_AIF_CLK_CTRL_CLK_INV_MASK GENMASK(14, 13)
> +#define SUN8I_AIF_CLK_CTRL_BCLK_DIV_MASK GENMASK(12, 9)
> +#define SUN8I_AIF_CLK_CTRL_LRCK_DIV_MASK GENMASK(8, 6)
> +#define SUN8I_AIF_CLK_CTRL_WORD_SIZ_MASK GENMASK(5, 4)
> +#define SUN8I_AIF_CLK_CTRL_DATA_FMT_MASK GENMASK(3, 2)
>
> #define SUN8I_CODEC_PASSTHROUGH_SAMPLE_RATE 48000
>
> #define SUN8I_CODEC_PCM_FORMATS (SNDRV_PCM_FMTBIT_S8 |\
> SNDRV_PCM_FMTBIT_S16_LE |\
> SNDRV_PCM_FMTBIT_S20_LE |\
> SNDRV_PCM_FMTBIT_S24_LE |\
> SNDRV_PCM_FMTBIT_S20_3LE|\
> @@ -223,32 +223,34 @@ static int sun8i_codec_update_sample_rate(struct sun8i_codec *scodec)
> hw_rate << SUN8I_SYS_SR_CTRL_AIF1_FS);
>
> return 0;
> }
>
> static int sun8i_codec_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
> {
> struct sun8i_codec *scodec = snd_soc_dai_get_drvdata(dai);
> + u32 reg = SUN8I_AIF_CLK_CTRL(dai->id);
> u32 format, invert, value;
>
> /* clock masters */
> switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
> case SND_SOC_DAIFMT_CBS_CFS: /* Codec slave, DAI master */
> value = 0x1;
> break;
> case SND_SOC_DAIFMT_CBM_CFM: /* Codec Master, DAI slave */
> value = 0x0;
> break;
> default:
> return -EINVAL;
> }
> - regmap_update_bits(scodec->regmap, SUN8I_AIF1CLK_CTRL,
> - BIT(SUN8I_AIF1CLK_CTRL_AIF1_MSTR_MOD),
> - value << SUN8I_AIF1CLK_CTRL_AIF1_MSTR_MOD);
> +
> + regmap_update_bits(scodec->regmap, reg,
> + BIT(SUN8I_AIF_CLK_CTRL_MSTR_MOD),
> + value << SUN8I_AIF_CLK_CTRL_MSTR_MOD);
I guess it would be more readable without the intermediate variable to
store the register.
With that fixed,
Acked-by: Maxime Ripard <mripard@kernel.org>
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2020-10-05 12:05 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 2:11 [PATCH 00/25] ASoC: sun8i-codec: support for AIF2 and AIF3 Samuel Holland
2020-10-01 2:11 ` [PATCH 01/25] ASoC: sun8i-codec: Set up clock tree at probe time Samuel Holland
2020-10-05 9:53 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 02/25] ASoC: sun8i-codec: Swap module clock/reset dependencies Samuel Holland
2020-10-05 9:54 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 03/25] ASoC: sun8i-codec: Sort DAPM controls, widgets, and routes Samuel Holland
2020-10-05 9:54 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 04/25] ASoC: sun8i-codec: Consistently name DAPM widgets " Samuel Holland
2020-10-05 9:57 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 05/25] ASoC: sun8i-codec: Correct DAPM widget types Samuel Holland
2020-10-05 9:57 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 06/25] ASoC: sun8i-codec: Fix AIF widget channel references Samuel Holland
2020-10-05 10:00 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 07/25] ASoC: sun8i-codec: Enable AIF mono/stereo control Samuel Holland
2020-10-05 10:00 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 08/25] ASoC: sun8i-codec: Use snd_soc_dai_get_drvdata Samuel Holland
2020-10-05 10:01 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 09/25] ASoC: sun8i-codec: Prepare to extend the DAI driver Samuel Holland
2020-10-05 11:24 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 10/25] ASoC: sun8i-codec: Program format before clock inversion Samuel Holland
2020-10-05 11:26 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 11/25] ASoC: sun8i-codec: Enable all supported clock inversions Samuel Holland
2020-10-05 11:30 ` Maxime Ripard
2020-10-06 4:29 ` Samuel Holland
2020-10-08 12:59 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 12/25] ASoC: sun8i-codec: Program the correct word size Samuel Holland
2020-10-05 11:30 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 13/25] ASoC: sun8i-codec: Round up the LRCK divisor Samuel Holland
2020-10-05 11:31 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 14/25] ASoC: sun8i-codec: Correct the BCLK divisor calculation Samuel Holland
2020-10-05 11:34 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 15/25] ASoC: sun8i-codec: Support the TDM slot binding Samuel Holland
2020-10-05 11:34 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 16/25] ASoC: sun8i-codec: Enforce symmetric DAI parameters Samuel Holland
2020-10-05 11:39 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 17/25] ASoC: sun8i-codec: Enable all supported sample rates Samuel Holland
2020-10-05 11:39 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 18/25] ASoC: sun8i-codec: Automatically set the system sample rate Samuel Holland
2020-10-05 11:58 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 19/25] ASoC: sun8i-codec: Constrain to compatible sample rates Samuel Holland
2020-10-05 11:59 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 20/25] ASoC: sun8i-codec: Protect the clock rate while streams are open Samuel Holland
2020-10-01 13:27 ` kernel test robot
2020-10-05 12:01 ` Maxime Ripard
2020-10-05 13:15 ` Chen-Yu Tsai
2020-10-06 4:46 ` Samuel Holland
2020-10-06 4:43 ` Samuel Holland
2020-10-08 13:02 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 21/25] ASoC: sun8i-codec: Require an exact BCLK divisor match Samuel Holland
2020-10-05 12:01 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 22/25] ASoC: sun8i-codec: Enable all supported PCM formats Samuel Holland
2020-10-05 12:02 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 23/25] ASoC: sun8i-codec: Generalize AIF clock control Samuel Holland
2020-10-05 12:04 ` Maxime Ripard [this message]
2020-10-06 4:51 ` Samuel Holland
2020-10-12 11:17 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 24/25] ASoC: sun8i-codec: Add a DAI, widgets, and routes for AIF2 Samuel Holland
2020-10-05 12:05 ` Maxime Ripard
2020-10-01 2:11 ` [PATCH 25/25] ASoC: sun8i-codec: Add a DAI, widgets, and routes for AIF3 Samuel Holland
2020-10-05 17:54 ` [PATCH 00/25] ASoC: sun8i-codec: support for AIF2 and AIF3 Mark Brown
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=20201005120459.5w5ligbconuwnzdv@gilmour.lan \
--to=maxime@cerno.tech \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=megous@megous.com \
--cc=perex@perex.cz \
--cc=samuel@sholland.org \
--cc=tiwai@suse.com \
--cc=wens@csie.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).