ASoC: tegra: tegra_alc5632: consider CPU-Platform possibility

commit e7fc99e641da ("ASoC: tegra: tegra_alc5632: 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 e7fc99e641da ("ASoC: tegra: tegra_alc5632: don't select unnecessary Platform")
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c
index 8f689ef2110e4b5cac1ba3d5eb60ac1c9fe6d109..9e8b1497efd3e543e8e495f4d8a8aae391897bc6 100644 (file)
--- a/sound/soc/tegra/tegra_alc5632.c
+++ b/sound/soc/tegra/tegra_alc5632.c
@@ -123,7 +123,8 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)
 
 SND_SOC_DAILINK_DEFS(pcm,
        DAILINK_COMP_ARRAY(COMP_EMPTY()),
-       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "alc5632-hifi")));
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "alc5632-hifi")),
+       DAILINK_COMP_ARRAY(COMP_EMPTY()));
 
 static struct snd_soc_dai_link tegra_alc5632_dai = {
        .name = "ALC5632",
@@ -194,6 +195,8 @@ static int tegra_alc5632_probe(struct platform_device *pdev)
                goto err_put_codec_of_node;
        }
 
+       tegra_alc5632_dai.platforms->of_node = tegra_alc5632_dai.cpus->of_node;
+
        ret = tegra_asoc_utils_init(&alc5632->util_data, &pdev->dev);
        if (ret)
                goto err_put_cpu_of_node;
@@ -212,6 +215,7 @@ err_fini_utils:
 err_put_cpu_of_node:
        of_node_put(tegra_alc5632_dai.cpus->of_node);
        tegra_alc5632_dai.cpus->of_node = NULL;
+       tegra_alc5632_dai.platforms->of_node = NULL;
 err_put_codec_of_node:
        of_node_put(tegra_alc5632_dai.codecs->of_node);
        tegra_alc5632_dai.codecs->of_node = NULL;
@@ -230,6 +234,7 @@ static int tegra_alc5632_remove(struct platform_device *pdev)
 
        of_node_put(tegra_alc5632_dai.cpus->of_node);
        tegra_alc5632_dai.cpus->of_node = NULL;
+       tegra_alc5632_dai.platforms->of_node = NULL;
        of_node_put(tegra_alc5632_dai.codecs->of_node);
        tegra_alc5632_dai.codecs->of_node = NULL;