Unverified Commit 1785af9f authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: intel: sof: 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/87wn22ypig.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/intel/boards/ehl_rt5660.c

+2 −6
Original line number Diff line number Diff line
@@ -254,7 +254,6 @@ static void hdmi_link_init(struct snd_soc_card *card, 
			   struct sof_card_private *ctx,

			   struct snd_soc_acpi_mach *mach)

{

	struct snd_soc_dai_link *link;

	int i;



	if (mach->mach_params.common_hdmi_codec_drv &&
@@ -267,11 +266,8 @@ static void hdmi_link_init(struct snd_soc_card *card, 
	 * if HDMI is not enabled in kernel config, or

	 * hdmi codec is not supported

	 */

	for (i = HDMI_LINK_START; i <= HDMI_LINE_END; i++) {

		link = &card->dai_link[i];

		link->codecs[0].name = "snd-soc-dummy";

		link->codecs[0].dai_name = "snd-soc-dummy-dai";

	}

	for (i = HDMI_LINK_START; i <= HDMI_LINE_END; i++)

		card->dai_link[i].codecs[0] = asoc_dummy_dlc;

}



static int snd_ehl_rt5660_probe(struct platform_device *pdev)

sound/soc/intel/boards/sof_cs42l42.c

+2 −9
Original line number Diff line number Diff line
@@ -296,13 +296,6 @@ static struct snd_soc_dai_link_component dmic_component[] = { 
	}

};



static struct snd_soc_dai_link_component dummy_component[] = {

	{

		.name = "snd-soc-dummy",

		.dai_name = "snd-soc-dummy-dai",

	}

};



static int create_spk_amp_dai_links(struct device *dev,

				    struct snd_soc_dai_link *links,

				    struct snd_soc_dai_link_component *cpus,
@@ -510,8 +503,8 @@ static int create_bt_offload_dai_links(struct device *dev, 
		goto devm_err;



	links[*id].id = *id;

	links[*id].codecs = dummy_component;

	links[*id].num_codecs = ARRAY_SIZE(dummy_component);

	links[*id].codecs = &asoc_dummy_dlc;

	links[*id].num_codecs = 1;

	links[*id].platforms = platform_component;

	links[*id].num_platforms = ARRAY_SIZE(platform_component);

sound/soc/intel/boards/sof_es8336.c

+2 −9
Original line number Diff line number Diff line
@@ -393,13 +393,6 @@ static struct snd_soc_dai_link_component dmic_component[] = { 
	}

};



static struct snd_soc_dai_link_component dummy_component[] = {

	{

		.name = "snd-soc-dummy",

		.dai_name = "snd-soc-dummy-dai",

	}

};



static int sof_es8336_late_probe(struct snd_soc_card *card)

{

	struct sof_es8336_private *priv = snd_soc_card_get_drvdata(card);
@@ -572,8 +565,8 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, 
			if (!links[id].name)

				return NULL;

			links[id].id = id + hdmi_id_offset;

			links[id].codecs = dummy_component;

			links[id].num_codecs = ARRAY_SIZE(dummy_component);

			links[id].codecs = &asoc_dummy_dlc;

			links[id].num_codecs = 1;

			links[id].platforms = platform_component;

			links[id].num_platforms = ARRAY_SIZE(platform_component);

			links[id].dpcm_capture = 1;

sound/soc/intel/boards/sof_nau8825.c

+2 −9
Original line number Diff line number Diff line
@@ -346,13 +346,6 @@ static struct snd_soc_dai_link_component nau8318_components[] = { 
	}

};



static struct snd_soc_dai_link_component dummy_component[] = {

	{

		.name = "snd-soc-dummy",

		.dai_name = "snd-soc-dummy-dai",

	}

};



static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,

							  int ssp_codec,

							  int ssp_amp,
@@ -532,8 +525,8 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, 
		links[id].name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT", port);

		if (!links[id].name)

			goto devm_err;

		links[id].codecs = dummy_component;

		links[id].num_codecs = ARRAY_SIZE(dummy_component);

		links[id].codecs = &asoc_dummy_dlc;

		links[id].num_codecs = 1;

		links[id].platforms = platform_component;

		links[id].num_platforms = ARRAY_SIZE(platform_component);

		links[id].dpcm_playback = 1;

sound/soc/intel/boards/sof_pcm512x.c

+1 −2
Original line number Diff line number Diff line
@@ -331,8 +331,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, 
				devm_kasprintf(dev, GFP_KERNEL,

					       "intel-hdmi-hifi%d", i);

		} else {

			idisp_components[i - 1].name = "snd-soc-dummy";

			idisp_components[i - 1].dai_name = "snd-soc-dummy-dai";

			idisp_components[i - 1] = asoc_dummy_dlc;

		}

		if (!idisp_components[i - 1].dai_name)

			goto devm_err;