iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: amd: use asoc_dummy_dlc

Browse Source 
Now we can share asoc_dummy_dlc. This patch use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com
Link: https://lore.kernel.org/r/875y9m0zwz.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org
This commit is contained in:
Kuninori Morimoto 2023-04-24 02:36:28 +00:00 committed by Mark Brown
parent 91cd742b22
commit 42e0861d79
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sound/soc/amd/acp/acp-mach-common.c
View File

@ -795,13 +795,6 @@ SND_SOC_DAILINK_DEF(dmic_codec,
DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec", "dmic-hifi"))); DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec", "dmic-hifi")));
/* Declare ACP CPU components */ /* Declare ACP CPU components */
static struct snd_soc_dai_link_component dummy_codec[] = {
{
.name = "snd-soc-dummy",
.dai_name = "snd-soc-dummy-dai",
}
};
static struct snd_soc_dai_link_component platform_component[] = { static struct snd_soc_dai_link_component platform_component[] = {
{ {
.name = "acp_asoc_renoir.0", .name = "acp_asoc_renoir.0",
@ -912,8 +905,8 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card)
links[i].no_pcm = 1; links[i].no_pcm = 1;
if (!drv_data->hs_codec_id) { if (!drv_data->hs_codec_id) {
/* Use dummy codec if codec id not specified */ /* Use dummy codec if codec id not specified */
links[i].codecs = dummy_codec; links[i].codecs = &asoc_dummy_dlc;
links[i].num_codecs = ARRAY_SIZE(dummy_codec); links[i].num_codecs = 1;
} }
if (drv_data->hs_codec_id == RT5682) { if (drv_data->hs_codec_id == RT5682) {
links[i].codecs = rt5682; links[i].codecs = rt5682;
@ -943,8 +936,8 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card)
links[i].no_pcm = 1; links[i].no_pcm = 1;
if (!drv_data->hs_codec_id) { if (!drv_data->hs_codec_id) {
/* Use dummy codec if codec id not specified */ /* Use dummy codec if codec id not specified */
links[i].codecs = dummy_codec; links[i].codecs = &asoc_dummy_dlc;
links[i].num_codecs = ARRAY_SIZE(dummy_codec); links[i].num_codecs = 1;
} }
if (drv_data->hs_codec_id == NAU8825) { if (drv_data->hs_codec_id == NAU8825) {
links[i].codecs = nau8825; links[i].codecs = nau8825;
@ -973,8 +966,8 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card)
links[i].no_pcm = 1; links[i].no_pcm = 1;
if (!drv_data->amp_codec_id) { if (!drv_data->amp_codec_id) {
/* Use dummy codec if codec id not specified */ /* Use dummy codec if codec id not specified */
links[i].codecs = dummy_codec; links[i].codecs = &asoc_dummy_dlc;
links[i].num_codecs = ARRAY_SIZE(dummy_codec); links[i].num_codecs = 1;
} }
if (drv_data->amp_codec_id == RT1019) { if (drv_data->amp_codec_id == RT1019) {
links[i].codecs = rt1019; links[i].codecs = rt1019;
@ -1005,8 +998,8 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card)
links[i].no_pcm = 1; links[i].no_pcm = 1;
if (!drv_data->amp_codec_id) { if (!drv_data->amp_codec_id) {
/* Use dummy codec if codec id not specified */ /* Use dummy codec if codec id not specified */
links[i].codecs = dummy_codec; links[i].codecs = &asoc_dummy_dlc;
links[i].num_codecs = ARRAY_SIZE(dummy_codec); links[i].num_codecs = 1;
} }
if (drv_data->amp_codec_id == MAX98360A) { if (drv_data->amp_codec_id == MAX98360A) {
links[i].codecs = max98360a; links[i].codecs = max98360a;
@ -1076,8 +1069,8 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card)
links[i].dpcm_capture = 1; links[i].dpcm_capture = 1;
if (!drv_data->hs_codec_id) { if (!drv_data->hs_codec_id) {
/* Use dummy codec if codec id not specified */ /* Use dummy codec if codec id not specified */
links[i].codecs = dummy_codec; links[i].codecs = &asoc_dummy_dlc;
links[i].num_codecs = ARRAY_SIZE(dummy_codec); links[i].num_codecs = 1;
} }
if (drv_data->hs_codec_id == RT5682) { if (drv_data->hs_codec_id == RT5682) {
links[i].codecs = rt5682; links[i].codecs = rt5682;
@ -1110,8 +1103,8 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card)
links[i].dpcm_capture = 1; links[i].dpcm_capture = 1;
if (!drv_data->hs_codec_id) { if (!drv_data->hs_codec_id) {
/* Use dummy codec if codec id not specified */ /* Use dummy codec if codec id not specified */
links[i].codecs = dummy_codec; links[i].codecs = &asoc_dummy_dlc;
links[i].num_codecs = ARRAY_SIZE(dummy_codec); links[i].num_codecs = 1;
} }
if (drv_data->hs_codec_id == NAU8825) { if (drv_data->hs_codec_id == NAU8825) {
links[i].codecs = nau8825; links[i].codecs = nau8825;
@ -1138,8 +1131,8 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card)
links[i].dpcm_playback = 1; links[i].dpcm_playback = 1;
if (!drv_data->amp_codec_id) { if (!drv_data->amp_codec_id) {
/* Use dummy codec if codec id not specified */ /* Use dummy codec if codec id not specified */
links[i].codecs = dummy_codec; links[i].codecs = &asoc_dummy_dlc;
links[i].num_codecs = ARRAY_SIZE(dummy_codec); links[i].num_codecs = 1;
} }
if (drv_data->amp_codec_id == RT1019) { if (drv_data->amp_codec_id == RT1019) {
links[i].codecs = rt1019; links[i].codecs = rt1019;
@ -1173,8 +1166,8 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card)
links[i].dpcm_playback = 1; links[i].dpcm_playback = 1;
if (!drv_data->amp_codec_id) { if (!drv_data->amp_codec_id) {
/* Use dummy codec if codec id not specified */ /* Use dummy codec if codec id not specified */
links[i].codecs = dummy_codec; links[i].codecs = &asoc_dummy_dlc;
links[i].num_codecs = ARRAY_SIZE(dummy_codec); links[i].num_codecs = 1;
} }
if (drv_data->amp_codec_id == MAX98360A) { if (drv_data->amp_codec_id == MAX98360A) {
links[i].codecs = max98360a; links[i].codecs = max98360a;
@ -1201,8 +1194,8 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card)
links[i].num_codecs = ARRAY_SIZE(dmic_codec); links[i].num_codecs = ARRAY_SIZE(dmic_codec);
} else { } else {
/* Use dummy codec if codec id not specified */ /* Use dummy codec if codec id not specified */
links[i].codecs = dummy_codec; links[i].codecs = &asoc_dummy_dlc;
links[i].num_codecs = ARRAY_SIZE(dummy_codec); links[i].num_codecs = 1;
} }
links[i].cpus = pdm_dmic; links[i].cpus = pdm_dmic;
links[i].num_cpus = ARRAY_SIZE(pdm_dmic); links[i].num_cpus = ARRAY_SIZE(pdm_dmic);