ASoC: qcom: sdw: Add TDM support
Subsystems (3)
RFC PATCH 1/2 ASoC: qcom: sdw: Add TDM support
Add qcom TDM setup function to support TDM ports for qcom platform.
--- sound/soc/qcom/sdw.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+)
sound/soc/qcom/sdw.c +64 -0
@@ -4,6 +4,7 @@#include <dt-bindings/sound/qcom,q6afe.h> #include <linux/module.h> +#include <sound/pcm_params.h> #include <sound/soc.h> #include "sdw.h"
@@ -101,6 +102,66 @@ int qcom_snd_sdw_prepare(struct snd_pcm_substream *substream, }EXPORT_SYMBOL_GPL (qcom_snd_sdw_prepare); +static int qcom_snd_tdm_hw_params (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *params) +{ +struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream); +struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 ); +unsigned int tdm_slot_offset[8 ] = {0 ,4 ,8 ,12 ,16 ,20 ,24 ,28 }; +int channels, slot_width; +int ret; + +switch (params_format (params)) { +case SNDRV_PCM_FORMAT_S16_LE : + slot_width =16 ; +break ; +case SNDRV_PCM_FORMAT_S24_LE : + slot_width =24 ; +break ; +case SNDRV_PCM_FORMAT_S32_LE : + slot_width =32 ; +break ; +default : +dev_err (rtd->dev,"%s: invalid param format 0x%x\n" , __func__, +params_format (params)); +return -EINVAL ; + } + + channels =params_channels (params); +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { + ret =snd_soc_dai_set_tdm_slot (cpu_dai,0 ,0x3 ,8 , slot_width); +if (ret <0 ) { +dev_err (rtd->dev,"%s: failed to set tdm slot, err:%d\n" , + __func__, ret); +return ret; + } + + ret =snd_soc_dai_set_channel_map (cpu_dai,0 ,NULL , channels, + tdm_slot_offset); +if (ret <0 ) { +dev_err (rtd->dev,"%s: failed to set channel map, err:%d\n" , + __func__, ret); +return ret; + } + }else { + ret =snd_soc_dai_set_tdm_slot (cpu_dai,0xf ,0 ,8 , slot_width); +if (ret <0 ) { +dev_err (rtd->dev,"%s: failed to set tdm slot, err:%d\n" , + __func__, ret); +return ret; + } + + ret =snd_soc_dai_set_channel_map (cpu_dai, channels, + tdm_slot_offset,0 ,NULL ); +if (ret <0 ) { +dev_err (rtd->dev,"%s: failed to set channel map, err:%d\n" , + __func__, ret); +return ret; + } + } +} +EXPORT_SYMBOL_GPL (qcom_snd_tdm_hw_params); +int qcom_snd_sdw_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params,struct sdw_stream_runtime **psruntime)
@@ -125,6 +186,9 @@ int qcom_snd_sdw_hw_params(struct snd_pcm_substream *substream, *psruntime = sruntime; }break ; + case PRIMARY_TDM_RX_0...QUINARY_TDM_TX_7: +qcom_snd_tdm_hw_params (substream, params); +break ; }return 0 ;
Signature · 1 line
2.41.0
RFC PATCH 2/2 ASoC: qcom: sm8250: Add TERTIARY_TDM_RX_0 support
Add TERTIARY_TDM_RX_0 case to make speaker amplifiers working on xiaomi-elish tablet.
--- sound/soc/qcom/sm8250.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
sound/soc/qcom/sm8250.c +19 -0
@@ -16,6 +16,7 @@#define DRIVER_NAME "sm8250"#define MI2S_BCLK_RATE 1536000 +#define TDM_BCLK_RATE 12288000struct sm8250_snd_data {bool stream_prepared[AFE_PORT_MAX ];
@@ -53,6 +54,7 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)struct snd_soc_pcm_runtime *rtd = substream->private_data;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 ); +int ret, j;switch (cpu_dai->id) {case TERTIARY_MI2S_RX :
@@ -63,6 +65,23 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)snd_soc_dai_set_fmt (cpu_dai, fmt);snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ; +case TERTIARY_TDM_RX_0 : + codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_DSP_A ; +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_TER_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); + +for_each_rtd_codec_dais (rtd, j, codec_dai) { + ret =snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +snd_soc_dai_set_sysclk (codec_dai, +0 , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (ret <0 ) { +dev_err (rtd->dev,"TDM fmt err:%d\n" , ret); +return ret; + } + } +break ;default :break ; }
Signature · 1 line
2.41.0
Mark Brown
maintainersound/soc/qcom/sdw.c int qcom_snd_sdw_prepare(struct snd_pcm_substream *substream, · line 164
Quoted 4 lines · Jianhua Lu
sound/soc/qcom/sdw.c +4
-0+ } +} +EXPORT_SYMBOL_GPL (qcom_snd_tdm_hw_params); +
Why is this exported?
sound/soc/qcom/sdw.c int qcom_snd_sdw_hw_params(struct snd_pcm_substream *substream, · line 192
Quoted 8 lines
sound/soc/qcom/sdw.c +3
-0@@ -125,6 +186,9 @@ int qcom_snd_sdw_hw_params(struct snd_pcm_substream *substream, *psruntime = sruntime; }break ; + case PRIMARY_TDM_RX_0...QUINARY_TDM_TX_7: +qcom_snd_tdm_hw_params (substream, params); +break ; }
The only caller is in the same file.
Quoted 8 lines · Mark Brown
sound/soc/qcom/sdw.c int qcom_snd_sdw_prepare(struct snd_pcm_substream *substream, · line 164
Quoted 4 lines · Jianhua Lu
sound/soc/qcom/sdw.c +4
-0+ } +} +EXPORT_SYMBOL_GPL (qcom_snd_tdm_hw_params); +Why is this exported?
Thanks for spotting it, I will drop it in patch v2.
Quoted 11 lines
sound/soc/qcom/sdw.c int qcom_snd_sdw_hw_params(struct snd_pcm_substream *substream, · line 192
Quoted 9 lines
sound/soc/qcom/sdw.c +3
-0@@ -125,6 +186,9 @@ int qcom_snd_sdw_hw_params(struct snd_pcm_substream *substream, *psruntime = sruntime; }break ; + case PRIMARY_TDM_RX_0...QUINARY_TDM_TX_7: +qcom_snd_tdm_hw_params (substream, params); +break ; }The only caller is in the same file.