ASoC: codes: Add support for ES8316 producer mode
PATCH 1/1 ASoC: codes: Add support for ES8316 producer mode
The AMD acp-es8336 machine driver requires ES8316 run in producer mode, which is not supported previously.
--- sound/soc/codecs/es8316.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
sound/soc/codecs/es8316.c +16 -5
@@ -401,9 +401,8 @@ static int es8316_set_dai_fmt(struct snd_soc_dai *codec_dai,u8 clksw;u8 mask; -if ((fmt &SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK ) !=SND_SOC_DAIFMT_CBC_CFC ) { -dev_err (component->dev,"Codec driver only supports consumer mode\n" ); -return -EINVAL ; +if ((fmt &SND_SOC_DAIFMT_MASTER_MASK ) ==SND_SOC_DAIFMT_CBP_CFP ) { + serdata1|=ES8316_SERDATA1_MASTER ; }if ((fmt &SND_SOC_DAIFMT_FORMAT_MASK ) !=SND_SOC_DAIFMT_I2S ) {
@@ -464,6 +463,8 @@ static int es8316_pcm_hw_params(struct snd_pcm_substream *substream,struct snd_soc_component *component = dai->component;struct es8316_priv *es8316 =snd_soc_component_get_drvdata (component);u8 wordlen =0 ; +u8 bclk_divider; +u16 lrck_divider;int i;/* Validate supported sample rates that are autodetected from MCLK */
@@ -477,19 +478,24 @@ static int es8316_pcm_hw_params(struct snd_pcm_substream *substream, }if (i ==NR_SUPPORTED_MCLK_LRCK_RATIOS )return -EINVAL ; - + lrck_divider = es8316->sysclk/params_rate (params); + bclk_divider = lrck_divider/4 ;switch (params_format (params)) {case SNDRV_PCM_FORMAT_S16_LE : wordlen =ES8316_SERDATA2_LEN_16 ; + bclk_divider/=16 ;break ;case SNDRV_PCM_FORMAT_S20_3LE : wordlen =ES8316_SERDATA2_LEN_20 ; + bclk_divider/=32 ;break ;case SNDRV_PCM_FORMAT_S24_LE : wordlen =ES8316_SERDATA2_LEN_24 ; + bclk_divider/=24 ;break ;case SNDRV_PCM_FORMAT_S32_LE : wordlen =ES8316_SERDATA2_LEN_32 ; + bclk_divider/=32 ;break ;default :return -EINVAL ;
@@ -499,6 +505,11 @@ static int es8316_pcm_hw_params(struct snd_pcm_substream *substream, ES8316_SERDATA2_LEN_MASK, wordlen);snd_soc_component_update_bits (component,ES8316_SERDATA_ADC ,ES8316_SERDATA2_LEN_MASK , wordlen); +snd_soc_component_update_bits (component,ES8316_SERDATA1 ,0x1f , bclk_divider); +snd_soc_component_update_bits (component,ES8316_CLKMGR_ADCDIV1 ,0x0f , lrck_divider >>8 ); +snd_soc_component_update_bits (component,ES8316_CLKMGR_ADCDIV2 ,0xff , lrck_divider &0xff ); +snd_soc_component_update_bits (component,ES8316_CLKMGR_DACDIV1 ,0x0f , lrck_divider >>8 ); +snd_soc_component_update_bits (component,ES8316_CLKMGR_DACDIV2 ,0xff , lrck_divider &0xff );return 0 ; }
@@ -510,7 +521,7 @@ static int es8316_mute(struct snd_soc_dai *dai, int mute, int direction) }#define ES8316_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \ - SNDRV_PCM_FMTBIT_S24_LE) + SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)static const struct snd_soc_dai_ops es8316_ops = { .startup = es8316_pcm_startup,
Signature · 1 line
2.36.1
Mark Brown
maintainerOn Fri, Jul 01, 2022 at 10:05:37AM +0800, Zhu Ning wrote:
This looks basically good, a few small things:
sound/soc/codecs/es8316.c static int es8316_set_dai_fmt(struct snd_soc_dai *codec_dai, · line 406
Quoted 6 lines
sound/soc/codecs/es8316.c +2
-3-if ((fmt &SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK ) !=SND_SOC_DAIFMT_CBC_CFC ) { -dev_err (component->dev,"Codec driver only supports consumer mode\n" ); -return -EINVAL ; +if ((fmt &SND_SOC_DAIFMT_MASTER_MASK ) ==SND_SOC_DAIFMT_CBP_CFP ) { + serdata1|=ES8316_SERDATA1_MASTER ; }
There's lots of small coding style things through this - for example here the { } isn't needed and
sound/soc/codecs/es8316.c static int es8316_pcm_hw_params(struct snd_pcm_substream *substream, · line 482
Quoted 2 lines
sound/soc/codecs/es8316.c +2
-0+ lrck_divider = es8316->sysclk/params_rate (params); + bclk_divider = lrck_divider/4 ;
There's a lot of cases without spaces around /.
sound/soc/codecs/es8316.c static int es8316_mute(struct snd_soc_dai *dai, int mute, int direction) · line 524
Quoted 3 lines
#define
ES8316_FORMATS(SNDRV_PCM_FMTBIT_S16_LE|SNDRV_PCM_FMTBIT_S20_3LE| \sound/soc/codecs/es8316.c +1
-1- SNDRV_PCM_FMTBIT_S24_LE) + SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
This is adding S32_LE support which is fine but wasn't mentioned in the changelog, it should be a separate patch.
Quoted 7 lines
sound/soc/codecs/es8316.c +0
-1/* Validate supported sample rates that are autodetected from MCLK */ @@ -477,19 +478,24 @@ static int es8316_pcm_hw_params(struct snd_pcm_substream *substream, }if (i ==NR_SUPPORTED_MCLK_LRCK_RATIOS )return -EINVAL ; -
sound/soc/codecs/es8316.c static int es8316_pcm_hw_params(struct snd_pcm_substream *substream, · line 490
Quoted 10 lines
sound/soc/codecs/es8316.c +4
-0+ lrck_divider = es8316->sysclk/params_rate (params); + bclk_divider = lrck_divider/4 ;switch (params_format (params)) {case SNDRV_PCM_FORMAT_S16_LE : wordlen =ES8316_SERDATA2_LEN_16 ; + bclk_divider/=16 ;break ;case SNDRV_PCM_FORMAT_S20_3LE : wordlen =ES8316_SERDATA2_LEN_20 ; + bclk_divider/=32 ;
S20_3LE uses 3 bytes, is the 32 divider correct here?
Quoted 10 lines
sound/soc/codecs/es8316.c +2
-0break ;case SNDRV_PCM_FORMAT_S24_LE : wordlen =ES8316_SERDATA2_LEN_24 ; + bclk_divider/=24;> break;case SNDRV_PCM_FORMAT_S32_LE : wordlen =ES8316_SERDATA2_LEN_32 ; + bclk_divider/=32 ;break ;default :return -EINVAL ;