Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 74a25f36 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: samsung: tm2_wm5110: consider CPU-Platform possibility 



commit ae7cbcc4 ("ASoC: samsung: tm2_wm5110: don't select unnecessary
Platform")

Current ALSA SoC avoid to add duplicate component to rtd,
and this driver was selecting CPU component as Platform component.
Thus, above patch removed Platform settings from this driver,
because it assumed these are same component.

But, some CPU driver is using generic DMAEngine, in such case, both
CPU component and Platform component will have same of_node/name.
In other words, there are some components which are different but
have same of_node/name.

In such case, Card driver definitely need to select Platform even
though it is same as CPU.
It is depends on CPU driver, but is difficult to know it from Card driver.
This patch reverts above patch.

Fixes: commit ae7cbcc4 ("ASoC: samsung: tm2_wm5110: don't select unnecessary Platform")
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3dfc3e9c

sound/soc/samsung/tm2_wm5110.c

+9 −3
Original line number Diff line number Diff line
@@ -429,17 +429,21 @@ static struct snd_soc_dai_driver tm2_ext_dai[] = { 


SND_SOC_DAILINK_DEFS(aif1,

	DAILINK_COMP_ARRAY(COMP_CPU(SAMSUNG_I2S_DAI)),

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif1")));

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif1")),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(voice,

	DAILINK_COMP_ARRAY(COMP_CPU(SAMSUNG_I2S_DAI)),

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif2")));

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif2")),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(bt,

	DAILINK_COMP_ARRAY(COMP_CPU(SAMSUNG_I2S_DAI)),

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif3")));

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif3")),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(hdmi,

	DAILINK_COMP_ARRAY(COMP_EMPTY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));
@@ -572,12 +576,14 @@ static int tm2_probe(struct platform_device *pdev) 
		unsigned int dai_index = 0; /* WM5110 */



		dai_link->cpus->name = NULL;

		dai_link->platforms->name = NULL;



		if (num_codecs > 1 && i == card->num_links - 1)

			dai_index = 1; /* HDMI */



		dai_link->codecs->of_node = codec_dai_node[dai_index];

		dai_link->cpus->of_node = cpu_dai_node[dai_index];

		dai_link->platforms->of_node = cpu_dai_node[dai_index];

	}



	if (num_codecs > 1) {