ASoC: tegra: tegra_rt5640: consider CPU-Platform possibility

[linux-2.6-block.git] / sound / soc / tegra / tegra_rt5640.c

diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c
index 4ed04689fac1de9a4da573dee29156b97f90cf84..d46915a3ec4cbae90cf0c12322ee2dc8b7fd16b2 100644 (file)
--- a/sound/soc/tegra/tegra_rt5640.c
+++ b/sound/soc/tegra/tegra_rt5640.c
@@ -117,7 +117,8 @@ static int tegra_rt5640_asoc_init(struct snd_soc_pcm_runtime *rtd)
 
 SND_SOC_DAILINK_DEFS(aif1,
        DAILINK_COMP_ARRAY(COMP_EMPTY()),
-       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5640-aif1")));
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5640-aif1")),
+       DAILINK_COMP_ARRAY(COMP_EMPTY()));
 
 static struct snd_soc_dai_link tegra_rt5640_dai = {
        .name = "RT5640",
@@ -187,6 +188,8 @@ static int tegra_rt5640_probe(struct platform_device *pdev)
                goto err;
        }
 
+       tegra_rt5640_dai.platforms->of_node = tegra_rt5640_dai.cpus->of_node;
+
        ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev);
        if (ret)
                goto err;