ASoC: omap-twl4030: Use the same name/node for platform as the cpu_dai

Now that the platform driver is registered with the cpu_dai's device we
can use the same name/node for it.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c
index 6a8d6b5f160debac623f79ad72b91dd5c77b1550..0c83e206e957423ee640309b7eeaace31113bc03 100644 (file)
--- a/sound/soc/omap/omap-twl4030.c
+++ b/sound/soc/omap/omap-twl4030.c
@@ -239,7 +239,7 @@ static struct snd_soc_dai_link omap_twl4030_dai_links[] = {
                .stream_name = "TWL4030 HiFi",
                .cpu_dai_name = "omap-mcbsp.2",
                .codec_dai_name = "twl4030-hifi",
-               .platform_name = "omap-pcm-audio",
+               .platform_name = "omap-mcbsp.2",
                .codec_name = "twl4030-codec",
                .init = omap_twl4030_init,
                .ops = &omap_twl4030_ops,
@@ -249,7 +249,7 @@ static struct snd_soc_dai_link omap_twl4030_dai_links[] = {
                .stream_name = "TWL4030 Voice",
                .cpu_dai_name = "omap-mcbsp.3",
                .codec_dai_name = "twl4030-voice",
-               .platform_name = "omap-pcm-audio",
+               .platform_name = "omap-mcbsp.2",
                .codec_name = "twl4030-codec",
                .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF |
                           SND_SOC_DAIFMT_CBM_CFM,
@@ -299,12 +299,18 @@ static int omap_twl4030_probe(struct platform_device *pdev)
                omap_twl4030_dai_links[0].cpu_dai_name  = NULL;
                omap_twl4030_dai_links[0].cpu_of_node = dai_node;
 
+               omap_twl4030_dai_links[0].platform_name  = NULL;
+               omap_twl4030_dai_links[0].platform_of_node = dai_node;
+
                dai_node = of_parse_phandle(node, "ti,mcbsp-voice", 0);
                if (!dai_node) {
                        card->num_links = 1;
                } else {
                        omap_twl4030_dai_links[1].cpu_dai_name  = NULL;
                        omap_twl4030_dai_links[1].cpu_of_node = dai_node;
+
+                       omap_twl4030_dai_links[1].platform_name  = NULL;
+                       omap_twl4030_dai_links[1].platform_of_node = dai_node;
                }
 
                priv->jack_detect = of_get_named_gpio(node,