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

Unverified Commit 806bfc27 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: samsung: smdk_wm8994: consider CPU-Platform possibility 



commit d815e0f0 ("ASoC: samsung: smdk_wm8994: 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 d815e0f0 ("ASoC: samsung: smdk_wm8994: 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 a0e95c4d

sound/soc/samsung/smdk_wm8994.c

+7 −2
Original line number Diff line number Diff line
@@ -102,11 +102,13 @@ static int smdk_wm8994_init_paiftx(struct snd_soc_pcm_runtime *rtd) 


SND_SOC_DAILINK_DEFS(aif1,

	DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s.0")),

	DAILINK_COMP_ARRAY(COMP_CODEC("wm8994-codec", "wm8994-aif1")));

	DAILINK_COMP_ARRAY(COMP_CODEC("wm8994-codec", "wm8994-aif1")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("samsung-i2s.0")));



SND_SOC_DAILINK_DEFS(fifo_tx,

	DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s-sec")),

	DAILINK_COMP_ARRAY(COMP_CODEC("wm8994-codec", "wm8994-aif1")));

	DAILINK_COMP_ARRAY(COMP_CODEC("wm8994-codec", "wm8994-aif1")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("samsung-i2s-sec")));



static struct snd_soc_dai_link smdk_dai[] = {

	{ /* Primary DAI i/f */
@@ -163,6 +165,9 @@ static int smdk_audio_probe(struct platform_device *pdev) 
			   "Property 'samsung,i2s-controller' missing or invalid\n");

			ret = -EINVAL;

		}



		smdk_dai[0].platforms->name = NULL;

		smdk_dai[0].platforms->of_node = smdk_dai[0].cpus->of_node;

	}



	id = of_match_device(of_match_ptr(samsung_wm8994_of_match), &pdev->dev);