With MI2S and TDM interfaces, multiple codecs typically share one bus. All codecs on the bus should receive the same format configuration, so apply the codec_fmt to all of them.
Signed-off-by: Val Packett <[email protected]> --- sound/soc/qcom/sm8250.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/sound/soc/qcom/sm8250.c b/sound/soc/qcom/sm8250.c index d67b7bd09c94..6e0e3e0ad55f 100644 --- a/sound/soc/qcom/sm8250.c +++ b/sound/soc/qcom/sm8250.c @@ -141,7 +141,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream) struct snd_soc_card *card = rtd->card; struct sm8250_snd_data *data = snd_soc_card_get_drvdata(card); struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *codec_dai; + int j; switch (cpu_dai->id) { case PRIMARY_MI2S_RX: @@ -151,7 +152,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream) Q6AFE_LPASS_CLK_ID_PRI_MI2S_IBIT, MI2S_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK); snd_soc_dai_set_fmt(cpu_dai, fmt); - snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); + for_each_rtd_codec_dais(rtd, j, codec_dai) + snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); break; case SECONDARY_MI2S_RX: codec_dai_fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_I2S; @@ -160,7 +162,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream) Q6AFE_LPASS_CLK_ID_SEC_MI2S_IBIT, MI2S_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK); snd_soc_dai_set_fmt(cpu_dai, fmt); - snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); + for_each_rtd_codec_dais(rtd, j, codec_dai) + snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); break; case TERTIARY_MI2S_RX: codec_dai_fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_I2S; @@ -169,7 +172,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream) Q6AFE_LPASS_CLK_ID_TER_MI2S_IBIT, MI2S_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK); snd_soc_dai_set_fmt(cpu_dai, fmt); - snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); + for_each_rtd_codec_dais(rtd, j, codec_dai) + snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); break; case QUINARY_MI2S_RX: codec_dai_fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_I2S; @@ -178,7 +182,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream) Q6AFE_LPASS_CLK_ID_QUI_MI2S_IBIT, MI2S_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK); snd_soc_dai_set_fmt(cpu_dai, fmt); - snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); + for_each_rtd_codec_dais(rtd, j, codec_dai) + snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); break; case SENARY_MI2S_RX: codec_dai_fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_I2S; @@ -187,7 +192,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream) Q6AFE_LPASS_CLK_ID_SEN_MI2S_IBIT, MI2S_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK); snd_soc_dai_set_fmt(cpu_dai, fmt); - snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); + for_each_rtd_codec_dais(rtd, j, codec_dai) + snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); break; case PRIMARY_TDM_RX_0: codec_dai_fmt |= SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_DSP_B; @@ -195,7 +201,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream) snd_soc_dai_set_sysclk(cpu_dai, Q6AFE_LPASS_CLK_ID_PRI_TDM_IBIT, TDM_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK); - snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); + for_each_rtd_codec_dais(rtd, j, codec_dai) + snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); break; case SECONDARY_TDM_RX_0: codec_dai_fmt |= SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_DSP_B; @@ -203,7 +210,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream) snd_soc_dai_set_sysclk(cpu_dai, Q6AFE_LPASS_CLK_ID_SEC_TDM_IBIT, TDM_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK); - snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); + for_each_rtd_codec_dais(rtd, j, codec_dai) + snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); break; case TERTIARY_TDM_RX_0: codec_dai_fmt |= SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_DSP_B; @@ -211,7 +219,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream) snd_soc_dai_set_sysclk(cpu_dai, Q6AFE_LPASS_CLK_ID_TER_TDM_IBIT, TDM_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK); - snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); + for_each_rtd_codec_dais(rtd, j, codec_dai) + snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); break; case QUATERNARY_TDM_RX_0: codec_dai_fmt |= SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_DSP_B; @@ -219,7 +228,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream) snd_soc_dai_set_sysclk(cpu_dai, Q6AFE_LPASS_CLK_ID_QUAD_TDM_IBIT, TDM_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK); - snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); + for_each_rtd_codec_dais(rtd, j, codec_dai) + snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); break; case QUINARY_TDM_RX_0: codec_dai_fmt |= SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_DSP_B; @@ -227,7 +237,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream) snd_soc_dai_set_sysclk(cpu_dai, Q6AFE_LPASS_CLK_ID_QUIN_TDM_IBIT, TDM_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK); - snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); + for_each_rtd_codec_dais(rtd, j, codec_dai) + snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); break; default: break; -- 2.53.0
