Commit 9213866a authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: fsl: imx-audmix: consider CPU-Platform possibility

commit d8893261 ("ASoC: fsl: imx-audmix: 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 d8893261 ("ASoC: fsl: imx-audmix: 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 9e8f5299
...@@ -207,8 +207,8 @@ static int imx_audmix_probe(struct platform_device *pdev) ...@@ -207,8 +207,8 @@ static int imx_audmix_probe(struct platform_device *pdev)
for (i = 0; i < num_dai; i++) { for (i = 0; i < num_dai; i++) {
struct snd_soc_dai_link_component *dlc; struct snd_soc_dai_link_component *dlc;
/* for CPU/Codec x 2 */ /* for CPU/Codec/Platform x 2 */
dlc = devm_kzalloc(&pdev->dev, 4 * sizeof(*dlc), GFP_KERNEL); dlc = devm_kzalloc(&pdev->dev, 6 * sizeof(*dlc), GFP_KERNEL);
if (!dlc) { if (!dlc) {
dev_err(&pdev->dev, "failed to allocate dai_link\n"); dev_err(&pdev->dev, "failed to allocate dai_link\n");
return -ENOMEM; return -ENOMEM;
...@@ -242,9 +242,11 @@ static int imx_audmix_probe(struct platform_device *pdev) ...@@ -242,9 +242,11 @@ static int imx_audmix_probe(struct platform_device *pdev)
priv->dai[i].cpus = &dlc[0]; priv->dai[i].cpus = &dlc[0];
priv->dai[i].codecs = &dlc[1]; priv->dai[i].codecs = &dlc[1];
priv->dai[i].platforms = &dlc[2];
priv->dai[i].num_cpus = 1; priv->dai[i].num_cpus = 1;
priv->dai[i].num_codecs = 1; priv->dai[i].num_codecs = 1;
priv->dai[i].num_platforms = 1;
priv->dai[i].name = dai_name; priv->dai[i].name = dai_name;
priv->dai[i].stream_name = "HiFi-AUDMIX-FE"; priv->dai[i].stream_name = "HiFi-AUDMIX-FE";
...@@ -252,6 +254,7 @@ static int imx_audmix_probe(struct platform_device *pdev) ...@@ -252,6 +254,7 @@ static int imx_audmix_probe(struct platform_device *pdev)
priv->dai[i].codecs->name = "snd-soc-dummy"; priv->dai[i].codecs->name = "snd-soc-dummy";
priv->dai[i].cpus->of_node = args.np; priv->dai[i].cpus->of_node = args.np;
priv->dai[i].cpus->dai_name = dev_name(&cpu_pdev->dev); priv->dai[i].cpus->dai_name = dev_name(&cpu_pdev->dev);
priv->dai[i].platforms->of_node = args.np;
priv->dai[i].dynamic = 1; priv->dai[i].dynamic = 1;
priv->dai[i].dpcm_playback = 1; priv->dai[i].dpcm_playback = 1;
priv->dai[i].dpcm_capture = (i == 0 ? 1 : 0); priv->dai[i].dpcm_capture = (i == 0 ? 1 : 0);
...@@ -266,17 +269,20 @@ static int imx_audmix_probe(struct platform_device *pdev) ...@@ -266,17 +269,20 @@ static int imx_audmix_probe(struct platform_device *pdev)
be_cp = devm_kasprintf(&pdev->dev, GFP_KERNEL, be_cp = devm_kasprintf(&pdev->dev, GFP_KERNEL,
"AUDMIX-Capture-%d", i); "AUDMIX-Capture-%d", i);
priv->dai[num_dai + i].cpus = &dlc[2]; priv->dai[num_dai + i].cpus = &dlc[3];
priv->dai[num_dai + i].codecs = &dlc[3]; priv->dai[num_dai + i].codecs = &dlc[4];
priv->dai[num_dai + i].platforms = &dlc[5];
priv->dai[num_dai + i].num_cpus = 1; priv->dai[num_dai + i].num_cpus = 1;
priv->dai[num_dai + i].num_codecs = 1; priv->dai[num_dai + i].num_codecs = 1;
priv->dai[num_dai + i].num_platforms = 1;
priv->dai[num_dai + i].name = be_name; priv->dai[num_dai + i].name = be_name;
priv->dai[num_dai + i].codecs->dai_name = "snd-soc-dummy-dai"; priv->dai[num_dai + i].codecs->dai_name = "snd-soc-dummy-dai";
priv->dai[num_dai + i].codecs->name = "snd-soc-dummy"; priv->dai[num_dai + i].codecs->name = "snd-soc-dummy";
priv->dai[num_dai + i].cpus->of_node = audmix_np; priv->dai[num_dai + i].cpus->of_node = audmix_np;
priv->dai[num_dai + i].cpus->dai_name = be_name; priv->dai[num_dai + i].cpus->dai_name = be_name;
priv->dai[num_dai + i].platforms->name = "snd-soc-dummy";
priv->dai[num_dai + i].no_pcm = 1; priv->dai[num_dai + i].no_pcm = 1;
priv->dai[num_dai + i].dpcm_playback = 1; priv->dai[num_dai + i].dpcm_playback = 1;
priv->dai[num_dai + i].dpcm_capture = 1; priv->dai[num_dai + i].dpcm_capture = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment