Skip to content

L
linux
Commit 20055300 authored by Venkata Prasad Potturu's avatar Venkata Prasad Potturu Committed by Mark Brown
Browse files
Options

ASoC: amd: acp: Add i2s tdm support in machine driver 

Add i2s tdm support for amd platforms.
Signed-off-by: default avatarVenkata Prasad Potturu <venkataprasad.potturu@amd.com>
Link: https://lore.kernel.org/r/20230109132104.1259479-5-venkataprasad.potturu@amd.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent ca9d2379
Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 14 deletions
sound/soc/amd/acp/acp-legacy-mach.c
View file @ 20055300
...@@ -27,6 +27,7 @@ static struct acp_card_drvdata rt5682_rt1019_data = { ...@@ -27,6 +27,7 @@ static struct acp_card_drvdata rt5682_rt1019_data = {
.hs_codec_id = RT5682, .hs_codec_id = RT5682,
.amp_codec_id = RT1019, .amp_codec_id = RT1019,
.dmic_codec_id = DMIC, .dmic_codec_id = DMIC,
.tdm_mode = false,
}; };
static struct acp_card_drvdata rt5682s_max_data = { static struct acp_card_drvdata rt5682s_max_data = {
...@@ -36,6 +37,7 @@ static struct acp_card_drvdata rt5682s_max_data = { ...@@ -36,6 +37,7 @@ static struct acp_card_drvdata rt5682s_max_data = {
.hs_codec_id = RT5682S, .hs_codec_id = RT5682S,
.amp_codec_id = MAX98360A, .amp_codec_id = MAX98360A,
.dmic_codec_id = DMIC, .dmic_codec_id = DMIC,
.tdm_mode = false,
}; };
static struct acp_card_drvdata rt5682s_rt1019_data = { static struct acp_card_drvdata rt5682s_rt1019_data = {
...@@ -45,6 +47,7 @@ static struct acp_card_drvdata rt5682s_rt1019_data = { ...@@ -45,6 +47,7 @@ static struct acp_card_drvdata rt5682s_rt1019_data = {
.hs_codec_id = RT5682S, .hs_codec_id = RT5682S,
.amp_codec_id = RT1019, .amp_codec_id = RT1019,
.dmic_codec_id = DMIC, .dmic_codec_id = DMIC,
.tdm_mode = false,
}; };
static struct acp_card_drvdata max_nau8825_data = { static struct acp_card_drvdata max_nau8825_data = {
...@@ -56,6 +59,7 @@ static struct acp_card_drvdata max_nau8825_data = { ...@@ -56,6 +59,7 @@ static struct acp_card_drvdata max_nau8825_data = {
.dmic_codec_id = DMIC, .dmic_codec_id = DMIC,
.soc_mclk = true, .soc_mclk = true,
.platform = REMBRANDT, .platform = REMBRANDT,
.tdm_mode = false,
}; };
static struct acp_card_drvdata rt5682s_rt1019_rmb_data = { static struct acp_card_drvdata rt5682s_rt1019_rmb_data = {
...@@ -67,6 +71,7 @@ static struct acp_card_drvdata rt5682s_rt1019_rmb_data = { ...@@ -67,6 +71,7 @@ static struct acp_card_drvdata rt5682s_rt1019_rmb_data = {
.dmic_codec_id = DMIC, .dmic_codec_id = DMIC,
.soc_mclk = true, .soc_mclk = true,
.platform = REMBRANDT, .platform = REMBRANDT,
.tdm_mode = false,
}; };
static const struct snd_kcontrol_new acp_controls[] = { static const struct snd_kcontrol_new acp_controls[] = {
......
sound/soc/amd/acp/acp-mach-common.c
View file @ 20055300
...@@ -124,10 +124,15 @@ static int acp_card_hs_startup(struct snd_pcm_substream *substream) ...@@ -124,10 +124,15 @@ static int acp_card_hs_startup(struct snd_pcm_substream *substream)
int ret; int ret;
unsigned int fmt; unsigned int fmt;
if (drvdata->tdm_mode)
fmt = SND_SOC_DAIFMT_DSP_A;
else
fmt = SND_SOC_DAIFMT_I2S;
if (drvdata->soc_mclk) if (drvdata->soc_mclk)
fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC; fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;
else else
fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP; fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP;
ret = snd_soc_dai_set_fmt(codec_dai, fmt); ret = snd_soc_dai_set_fmt(codec_dai, fmt);
if (ret < 0) { if (ret < 0) {
...@@ -169,10 +174,15 @@ static int acp_card_rt5682_hw_params(struct snd_pcm_substream *substream, ...@@ -169,10 +174,15 @@ static int acp_card_rt5682_hw_params(struct snd_pcm_substream *substream,
ch = params_channels(params); ch = params_channels(params);
format = 8 * params_format(params); format = 8 * params_format(params);
if (drvdata->tdm_mode)
fmt = SND_SOC_DAIFMT_DSP_A;
else
fmt = SND_SOC_DAIFMT_I2S;
if (drvdata->soc_mclk) if (drvdata->soc_mclk)
fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC; fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;
else else
fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP; fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP;
ret = snd_soc_dai_set_fmt(cpu_dai, fmt); ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
if (ret && ret != -ENOTSUPP) { if (ret && ret != -ENOTSUPP) {
...@@ -186,6 +196,23 @@ static int acp_card_rt5682_hw_params(struct snd_pcm_substream *substream, ...@@ -186,6 +196,23 @@ static int acp_card_rt5682_hw_params(struct snd_pcm_substream *substream,
return ret; return ret;
} }
if (drvdata->tdm_mode) {
/**
* As codec supports slot 0 and slot 1 for playback and capture.
*/
ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0x3, 0x3, 8, 16);
if (ret && ret != -ENOTSUPP) {
dev_err(rtd->dev, "set TDM slot err: %d\n", ret);
return ret;
}
ret = snd_soc_dai_set_tdm_slot(codec_dai, 0x3, 0x3, 8, 16);
if (ret < 0) {
dev_warn(rtd->dev, "set TDM slot err:%d\n", ret);
return ret;
}
}
ret = snd_soc_dai_set_pll(codec_dai, RT5682_PLL2, RT5682_PLL2_S_MCLK, ret = snd_soc_dai_set_pll(codec_dai, RT5682_PLL2, RT5682_PLL2_S_MCLK,
PCO_PLAT_CLK, RT5682_PLL_FREQ); PCO_PLAT_CLK, RT5682_PLL_FREQ);
if (ret < 0) { if (ret < 0) {
...@@ -291,10 +318,15 @@ static int acp_card_rt5682s_hw_params(struct snd_pcm_substream *substream, ...@@ -291,10 +318,15 @@ static int acp_card_rt5682s_hw_params(struct snd_pcm_substream *substream,
ch = params_channels(params); ch = params_channels(params);
format = 8 * params_format(params); format = 8 * params_format(params);
if (drvdata->tdm_mode)
fmt = SND_SOC_DAIFMT_DSP_A;
else
fmt = SND_SOC_DAIFMT_I2S;
if (drvdata->soc_mclk) if (drvdata->soc_mclk)
fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC; fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;
else else
fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP; fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP;
ret = snd_soc_dai_set_fmt(cpu_dai, fmt); ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
if (ret && ret != -ENOTSUPP) { if (ret && ret != -ENOTSUPP) {
...@@ -308,6 +340,23 @@ static int acp_card_rt5682s_hw_params(struct snd_pcm_substream *substream, ...@@ -308,6 +340,23 @@ static int acp_card_rt5682s_hw_params(struct snd_pcm_substream *substream,
return ret; return ret;
} }
if (drvdata->tdm_mode) {
/**
* As codec supports slot 0 and slot 1 for playback and capture.
*/
ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0x3, 0x3, 8, 16);
if (ret && ret != -ENOTSUPP) {
dev_err(rtd->dev, "set TDM slot err: %d\n", ret);
return ret;
}
ret = snd_soc_dai_set_tdm_slot(codec_dai, 0x3, 0x3, 8, 16);
if (ret < 0) {
dev_warn(rtd->dev, "set TDM slot err:%d\n", ret);
return ret;
}
}
ret = snd_soc_dai_set_pll(codec_dai, RT5682S_PLL2, RT5682S_PLL_S_MCLK, ret = snd_soc_dai_set_pll(codec_dai, RT5682S_PLL2, RT5682S_PLL_S_MCLK,
PCO_PLAT_CLK, RT5682_PLL_FREQ); PCO_PLAT_CLK, RT5682_PLL_FREQ);
if (ret < 0) { if (ret < 0) {
...@@ -417,10 +466,15 @@ static int acp_card_rt1019_hw_params(struct snd_pcm_substream *substream, ...@@ -417,10 +466,15 @@ static int acp_card_rt1019_hw_params(struct snd_pcm_substream *substream,
if (drvdata->amp_codec_id != RT1019) if (drvdata->amp_codec_id != RT1019)
return -EINVAL; return -EINVAL;
if (drvdata->tdm_mode)
fmt = SND_SOC_DAIFMT_DSP_A;
else
fmt = SND_SOC_DAIFMT_I2S;
if (drvdata->soc_mclk) if (drvdata->soc_mclk)
fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC; fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;
else else
fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP; fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP;
ret = snd_soc_dai_set_fmt(cpu_dai, fmt); ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
if (ret && ret != -ENOTSUPP) { if (ret && ret != -ENOTSUPP) {
...@@ -428,12 +482,28 @@ static int acp_card_rt1019_hw_params(struct snd_pcm_substream *substream, ...@@ -428,12 +482,28 @@ static int acp_card_rt1019_hw_params(struct snd_pcm_substream *substream,
return ret; return ret;
} }
if (drvdata->tdm_mode) {
/**
* As codec supports slot 2 and slot 3 for playback.
*/
ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0xC, 0, 8, 16);
if (ret && ret != -ENOTSUPP) {
dev_err(rtd->dev, "set TDM slot err: %d\n", ret);
return ret;
}
}
for_each_rtd_codec_dais(rtd, i, codec_dai) { for_each_rtd_codec_dais(rtd, i, codec_dai) {
if (strcmp(codec_dai->name, "rt1019-aif")) if (strcmp(codec_dai->name, "rt1019-aif"))
continue; continue;
ret = snd_soc_dai_set_pll(codec_dai, 0, RT1019_PLL_S_BCLK, if (drvdata->tdm_mode)
ch * format * srate, 256 * srate); ret = snd_soc_dai_set_pll(codec_dai, 0, RT1019_PLL_S_BCLK,
TDM_CHANNELS * format * srate, 256 * srate);
else
ret = snd_soc_dai_set_pll(codec_dai, 0, RT1019_PLL_S_BCLK,
ch * format * srate, 256 * srate);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -441,6 +511,33 @@ static int acp_card_rt1019_hw_params(struct snd_pcm_substream *substream, ...@@ -441,6 +511,33 @@ static int acp_card_rt1019_hw_params(struct snd_pcm_substream *substream,
256 * srate, SND_SOC_CLOCK_IN); 256 * srate, SND_SOC_CLOCK_IN);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (drvdata->tdm_mode) {
ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_A
| SND_SOC_DAIFMT_NB_NF);
if (ret < 0) {
dev_err(rtd->card->dev, "Failed to set dai fmt: %d\n", ret);
return ret;
}
/**
* As codec supports slot 2 for left channel playback.
*/
if (!strcmp(codec_dai->component->name, "i2c-10EC1019:00")) {
ret = snd_soc_dai_set_tdm_slot(codec_dai, 0x4, 0x4, 8, 16);
if (ret < 0)
break;
}
/**
* As codec supports slot 3 for right channel playback.
*/
if (!strcmp(codec_dai->component->name, "i2c-10EC1019:01")) {
ret = snd_soc_dai_set_tdm_slot(codec_dai, 0x8, 0x8, 8, 16);
if (ret < 0)
break;
}
}
} }
if (!drvdata->soc_mclk) { if (!drvdata->soc_mclk) {
...@@ -507,10 +604,15 @@ static int acp_card_maxim_hw_params(struct snd_pcm_substream *substream, ...@@ -507,10 +604,15 @@ static int acp_card_maxim_hw_params(struct snd_pcm_substream *substream,
ch = params_channels(params); ch = params_channels(params);
format = 8 * params_format(params); format = 8 * params_format(params);
if (drvdata->tdm_mode)
fmt = SND_SOC_DAIFMT_DSP_A;
else
fmt = SND_SOC_DAIFMT_I2S;
if (drvdata->soc_mclk) if (drvdata->soc_mclk)
fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC; fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;
else else
fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP; fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP;
ret = snd_soc_dai_set_fmt(cpu_dai, fmt); ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
if (ret && ret != -ENOTSUPP) { if (ret && ret != -ENOTSUPP) {
...@@ -518,6 +620,17 @@ static int acp_card_maxim_hw_params(struct snd_pcm_substream *substream, ...@@ -518,6 +620,17 @@ static int acp_card_maxim_hw_params(struct snd_pcm_substream *substream,
return ret; return ret;
} }
if (drvdata->tdm_mode) {
/**
* As codec supports slot 2 and slot 3 for playback.
*/
ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0xC, 0, 8, 16);
if (ret && ret != -ENOTSUPP) {
dev_err(rtd->dev, "set TDM slot err: %d\n", ret);
return ret;
}
}
if (!drvdata->soc_mclk) { if (!drvdata->soc_mclk) {
ret = acp_clk_enable(drvdata, srate, ch * format); ret = acp_clk_enable(drvdata, srate, ch * format);
if (ret < 0) { if (ret < 0) {
...@@ -603,10 +716,15 @@ static int acp_nau8825_hw_params(struct snd_pcm_substream *substream, ...@@ -603,10 +716,15 @@ static int acp_nau8825_hw_params(struct snd_pcm_substream *substream,
return ret; return ret;
} }
if (drvdata->tdm_mode)
fmt = SND_SOC_DAIFMT_DSP_A;
else
fmt = SND_SOC_DAIFMT_I2S;
if (drvdata->soc_mclk) if (drvdata->soc_mclk)
fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC; fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;
else else
fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP; fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP;
ret = snd_soc_dai_set_fmt(cpu_dai, fmt); ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
if (ret && ret != -ENOTSUPP) { if (ret && ret != -ENOTSUPP) {
...@@ -620,6 +738,22 @@ static int acp_nau8825_hw_params(struct snd_pcm_substream *substream, ...@@ -620,6 +738,22 @@ static int acp_nau8825_hw_params(struct snd_pcm_substream *substream,
return ret; return ret;
} }
if (drvdata->tdm_mode) {
/**
* As codec supports slot 4 and slot 5 for playback and slot 6 for capture.
*/
ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0x30, 0xC0, 8, 16);
if (ret && ret != -ENOTSUPP) {
dev_err(rtd->dev, "set TDM slot err: %d\n", ret);
return ret;
}
ret = snd_soc_dai_set_tdm_slot(codec_dai, 0x40, 0x30, 8, 16);
if (ret < 0) {
dev_warn(rtd->dev, "set TDM slot err:%d\n", ret);
return ret;
}
}
return ret; return ret;
} }
......
sound/soc/amd/acp/acp-mach.h
View file @ 20055300
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <sound/soc.h> #include <sound/soc.h>
#define TDM_CHANNELS 8
enum be_id { enum be_id {
HEADSET_BE_ID = 0, HEADSET_BE_ID = 0,
AMP_BE_ID, AMP_BE_ID,
...@@ -58,6 +60,7 @@ struct acp_card_drvdata { ...@@ -58,6 +60,7 @@ struct acp_card_drvdata {
struct clk *wclk; struct clk *wclk;
struct clk *bclk; struct clk *bclk;
bool soc_mclk; bool soc_mclk;
bool tdm_mode;
}; };
int acp_sofdsp_dai_links_create(struct snd_soc_card *card); int acp_sofdsp_dai_links_create(struct snd_soc_card *card);
......
sound/soc/amd/acp/acp-sof-mach.c
View file @ 20055300
...@@ -27,6 +27,7 @@ static struct acp_card_drvdata sof_rt5682_rt1019_data = { ...@@ -27,6 +27,7 @@ static struct acp_card_drvdata sof_rt5682_rt1019_data = {
.hs_codec_id = RT5682, .hs_codec_id = RT5682,
.amp_codec_id = RT1019, .amp_codec_id = RT1019,
.dmic_codec_id = DMIC, .dmic_codec_id = DMIC,
.tdm_mode = false,
}; };
static struct acp_card_drvdata sof_rt5682_max_data = { static struct acp_card_drvdata sof_rt5682_max_data = {
...@@ -36,6 +37,7 @@ static struct acp_card_drvdata sof_rt5682_max_data = { ...@@ -36,6 +37,7 @@ static struct acp_card_drvdata sof_rt5682_max_data = {
.hs_codec_id = RT5682, .hs_codec_id = RT5682,
.amp_codec_id = MAX98360A, .amp_codec_id = MAX98360A,
.dmic_codec_id = DMIC, .dmic_codec_id = DMIC,
.tdm_mode = false,
}; };
static struct acp_card_drvdata sof_rt5682s_rt1019_data = { static struct acp_card_drvdata sof_rt5682s_rt1019_data = {
...@@ -45,6 +47,7 @@ static struct acp_card_drvdata sof_rt5682s_rt1019_data = { ...@@ -45,6 +47,7 @@ static struct acp_card_drvdata sof_rt5682s_rt1019_data = {
.hs_codec_id = RT5682S, .hs_codec_id = RT5682S,
.amp_codec_id = RT1019, .amp_codec_id = RT1019,
.dmic_codec_id = DMIC, .dmic_codec_id = DMIC,
.tdm_mode = false,
}; };
static struct acp_card_drvdata sof_rt5682s_max_data = { static struct acp_card_drvdata sof_rt5682s_max_data = {
...@@ -54,6 +57,7 @@ static struct acp_card_drvdata sof_rt5682s_max_data = { ...@@ -54,6 +57,7 @@ static struct acp_card_drvdata sof_rt5682s_max_data = {
.hs_codec_id = RT5682S, .hs_codec_id = RT5682S,
.amp_codec_id = MAX98360A, .amp_codec_id = MAX98360A,
.dmic_codec_id = DMIC, .dmic_codec_id = DMIC,
.tdm_mode = false,
}; };
static struct acp_card_drvdata sof_nau8825_data = { static struct acp_card_drvdata sof_nau8825_data = {
...@@ -64,6 +68,7 @@ static struct acp_card_drvdata sof_nau8825_data = { ...@@ -64,6 +68,7 @@ static struct acp_card_drvdata sof_nau8825_data = {
.amp_codec_id = MAX98360A, .amp_codec_id = MAX98360A,
.dmic_codec_id = DMIC, .dmic_codec_id = DMIC,
.soc_mclk = true, .soc_mclk = true,
.tdm_mode = false,
}; };
static struct acp_card_drvdata sof_rt5682s_hs_rt1019_data = { static struct acp_card_drvdata sof_rt5682s_hs_rt1019_data = {
...@@ -74,6 +79,7 @@ static struct acp_card_drvdata sof_rt5682s_hs_rt1019_data = { ...@@ -74,6 +79,7 @@ static struct acp_card_drvdata sof_rt5682s_hs_rt1019_data = {
.amp_codec_id = RT1019, .amp_codec_id = RT1019,
.dmic_codec_id = DMIC, .dmic_codec_id = DMIC,
.soc_mclk = true, .soc_mclk = true,
.tdm_mode = false,
}; };
static const struct snd_kcontrol_new acp_controls[] = { static const struct snd_kcontrol_new acp_controls[] = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7