Unverified Commit 42e0861d authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: amd: use asoc_dummy_dlc 



Now we can share asoc_dummy_dlc. This patch use it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/875y9m0zwz.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 91cd742b

sound/soc/amd/acp/acp-mach-common.c

+18 −25
Original line number Diff line number Diff line
@@ -795,13 +795,6 @@ SND_SOC_DAILINK_DEF(dmic_codec, 
		DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec", "dmic-hifi")));



/* 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[] = {

	{

		 .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;

		if (!drv_data->hs_codec_id) {

			/* Use dummy codec if codec id not specified */

			links[i].codecs = dummy_codec;

			links[i].num_codecs = ARRAY_SIZE(dummy_codec);

			links[i].codecs = &asoc_dummy_dlc;

			links[i].num_codecs = 1;

		}

		if (drv_data->hs_codec_id == 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;

		if (!drv_data->hs_codec_id) {

			/* Use dummy codec if codec id not specified */

			links[i].codecs = dummy_codec;

			links[i].num_codecs = ARRAY_SIZE(dummy_codec);

			links[i].codecs = &asoc_dummy_dlc;

			links[i].num_codecs = 1;

		}

		if (drv_data->hs_codec_id == 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;

		if (!drv_data->amp_codec_id) {

			/* Use dummy codec if codec id not specified */

			links[i].codecs = dummy_codec;

			links[i].num_codecs = ARRAY_SIZE(dummy_codec);

			links[i].codecs = &asoc_dummy_dlc;

			links[i].num_codecs = 1;

		}

		if (drv_data->amp_codec_id == 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;

		if (!drv_data->amp_codec_id) {

			/* Use dummy codec if codec id not specified */

			links[i].codecs = dummy_codec;

			links[i].num_codecs = ARRAY_SIZE(dummy_codec);

			links[i].codecs = &asoc_dummy_dlc;

			links[i].num_codecs = 1;

		}

		if (drv_data->amp_codec_id == 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;

		if (!drv_data->hs_codec_id) {

			/* Use dummy codec if codec id not specified */

			links[i].codecs = dummy_codec;

			links[i].num_codecs = ARRAY_SIZE(dummy_codec);

			links[i].codecs = &asoc_dummy_dlc;

			links[i].num_codecs = 1;

		}

		if (drv_data->hs_codec_id == 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;

		if (!drv_data->hs_codec_id) {

			/* Use dummy codec if codec id not specified */

			links[i].codecs = dummy_codec;

			links[i].num_codecs = ARRAY_SIZE(dummy_codec);

			links[i].codecs = &asoc_dummy_dlc;

			links[i].num_codecs = 1;

		}

		if (drv_data->hs_codec_id == 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;

		if (!drv_data->amp_codec_id) {

			/* Use dummy codec if codec id not specified */

			links[i].codecs = dummy_codec;

			links[i].num_codecs = ARRAY_SIZE(dummy_codec);

			links[i].codecs = &asoc_dummy_dlc;

			links[i].num_codecs = 1;

		}

		if (drv_data->amp_codec_id == 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;

		if (!drv_data->amp_codec_id) {

			/* Use dummy codec if codec id not specified */

			links[i].codecs = dummy_codec;

			links[i].num_codecs = ARRAY_SIZE(dummy_codec);

			links[i].codecs = &asoc_dummy_dlc;

			links[i].num_codecs = 1;

		}

		if (drv_data->amp_codec_id == 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);

		} else {

			/* Use dummy codec if codec id not specified */

			links[i].codecs = dummy_codec;

			links[i].num_codecs = ARRAY_SIZE(dummy_codec);

			links[i].codecs = &asoc_dummy_dlc;

			links[i].num_codecs = 1;

		}

		links[i].cpus = pdm_dmic;

		links[i].num_cpus = ARRAY_SIZE(pdm_dmic);