94 lines
2.8 KiB
Diff
94 lines
2.8 KiB
Diff
From 6276b2b4ad282b99c52b6398dc86bff2d0b8d486 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Holland <samuel@sholland.org>
|
|
Date: Wed, 14 Oct 2020 01:19:26 -0500
|
|
Subject: [PATCH 299/351] ASoC: sun8i-codec: Program DAI format before clock
|
|
inversion
|
|
|
|
The LRCK inversion bit has a different meaning in DSP mode: it selects
|
|
between the DSP A and DSP B formats. To support this, we need to know if
|
|
the selected format is a DSP format. One easy way to do this is to set
|
|
the format field before the clock inversion fields.
|
|
|
|
Acked-by: Maxime Ripard <mripard@kernel.org>
|
|
Signed-off-by: Samuel Holland <samuel@sholland.org>
|
|
Link: https://lore.kernel.org/r/20201014061941.4306-3-samuel@sholland.org
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
sound/soc/sunxi/sun8i-codec.c | 46 +++++++++++++++++------------------
|
|
1 file changed, 23 insertions(+), 23 deletions(-)
|
|
|
|
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
|
|
index 6413873a0584..53c9289a4249 100644
|
|
--- a/sound/soc/sunxi/sun8i-codec.c
|
|
+++ b/sound/soc/sunxi/sun8i-codec.c
|
|
@@ -173,7 +173,7 @@ static int sun8i_codec_get_hw_rate(struct snd_pcm_hw_params *params)
|
|
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 value;
|
|
+ u32 format, value;
|
|
|
|
/* clock masters */
|
|
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
|
@@ -190,6 +190,28 @@ static int sun8i_codec_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
|
BIT(SUN8I_AIF1CLK_CTRL_AIF1_MSTR_MOD),
|
|
value << SUN8I_AIF1CLK_CTRL_AIF1_MSTR_MOD);
|
|
|
|
+ /* DAI format */
|
|
+ switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
|
|
+ case SND_SOC_DAIFMT_I2S:
|
|
+ format = 0x0;
|
|
+ break;
|
|
+ case SND_SOC_DAIFMT_LEFT_J:
|
|
+ format = 0x1;
|
|
+ break;
|
|
+ case SND_SOC_DAIFMT_RIGHT_J:
|
|
+ format = 0x2;
|
|
+ break;
|
|
+ case SND_SOC_DAIFMT_DSP_A:
|
|
+ case SND_SOC_DAIFMT_DSP_B:
|
|
+ format = 0x3;
|
|
+ break;
|
|
+ default:
|
|
+ return -EINVAL;
|
|
+ }
|
|
+ regmap_update_bits(scodec->regmap, SUN8I_AIF1CLK_CTRL,
|
|
+ SUN8I_AIF1CLK_CTRL_AIF1_DATA_FMT_MASK,
|
|
+ format << SUN8I_AIF1CLK_CTRL_AIF1_DATA_FMT);
|
|
+
|
|
/* clock inversion */
|
|
switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
|
|
case SND_SOC_DAIFMT_NB_NF: /* Normal */
|
|
@@ -220,28 +242,6 @@ static int sun8i_codec_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
|
BIT(SUN8I_AIF1CLK_CTRL_AIF1_LRCK_INV),
|
|
value << SUN8I_AIF1CLK_CTRL_AIF1_LRCK_INV);
|
|
|
|
- /* DAI format */
|
|
- switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
|
|
- case SND_SOC_DAIFMT_I2S:
|
|
- value = 0x0;
|
|
- break;
|
|
- case SND_SOC_DAIFMT_LEFT_J:
|
|
- value = 0x1;
|
|
- break;
|
|
- case SND_SOC_DAIFMT_RIGHT_J:
|
|
- value = 0x2;
|
|
- break;
|
|
- case SND_SOC_DAIFMT_DSP_A:
|
|
- case SND_SOC_DAIFMT_DSP_B:
|
|
- value = 0x3;
|
|
- break;
|
|
- default:
|
|
- return -EINVAL;
|
|
- }
|
|
- regmap_update_bits(scodec->regmap, SUN8I_AIF1CLK_CTRL,
|
|
- SUN8I_AIF1CLK_CTRL_AIF1_DATA_FMT_MASK,
|
|
- value << SUN8I_AIF1CLK_CTRL_AIF1_DATA_FMT);
|
|
-
|
|
return 0;
|
|
}
|
|
|
|
--
|
|
2.34.0
|
|
|