ASoC: tegra: tegra_rt5677: consider CPU-Platform possibility

commit d035d13b2277 ("ASoC: tegra: tegra_rt5677: 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 d035d13b2277 ("ASoC: tegra: tegra_rt5677: 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_rt5677.c b/sound/soc/tegra/tegra_rt5677.c
index 738bdf876b134c9058c9415727e2a26bab61cef7..81cb6cc6236e4410e0a75679a8ecece79f251054 100644 (file)
--- a/sound/soc/tegra/tegra_rt5677.c
+++ b/sound/soc/tegra/tegra_rt5677.c
@@ -160,7 +160,8 @@ static int tegra_rt5677_asoc_init(struct snd_soc_pcm_runtime *rtd)
 
 SND_SOC_DAILINK_DEFS(pcm,
        DAILINK_COMP_ARRAY(COMP_EMPTY()),
-       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5677-aif1")));
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5677-aif1")),
+       DAILINK_COMP_ARRAY(COMP_EMPTY()));
 
 static struct snd_soc_dai_link tegra_rt5677_dai = {
        .name = "RT5677",
@@ -259,6 +260,7 @@ static int tegra_rt5677_probe(struct platform_device *pdev)
                ret = -EINVAL;
                goto err_put_codec_of_node;
        }
+       tegra_rt5677_dai.platforms->of_node = tegra_rt5677_dai.cpus->of_node;
 
        ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev);
        if (ret)
@@ -278,6 +280,7 @@ err_fini_utils:
 err_put_cpu_of_node:
        of_node_put(tegra_rt5677_dai.cpus->of_node);
        tegra_rt5677_dai.cpus->of_node = NULL;
+       tegra_rt5677_dai.platforms->of_node = NULL;
 err_put_codec_of_node:
        of_node_put(tegra_rt5677_dai.codecs->of_node);
        tegra_rt5677_dai.codecs->of_node = NULL;
@@ -294,6 +297,7 @@ static int tegra_rt5677_remove(struct platform_device *pdev)
 
        tegra_asoc_utils_fini(&machine->util_data);
 
+       tegra_rt5677_dai.platforms->of_node = NULL;
        of_node_put(tegra_rt5677_dai.codecs->of_node);
        tegra_rt5677_dai.codecs->of_node = NULL;
        of_node_put(tegra_rt5677_dai.cpus->of_node);