ASoC: omap-abe-twl6040: Use the cpu_dai node to specify the platform driver

Now that the platform driver is registered with the cpu_dai's device we
can use the same node for it instead of the hardwired name.
We can also remove the cpu_dai_name and platform_name from the dai_link
struct since we only support DT boot on OMAP4/5

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

diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c
index 024dafc3e2981b752c6d9526a35644f984076f61..1a89e5b1be163bc07e35cc6d8ea274c437f18e11 100644 (file)
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@ -214,9 +214,7 @@ static struct snd_soc_dai_link abe_twl6040_dai_links[] = {
        {
                .name = "TWL6040",
                .stream_name = "TWL6040",
-               .cpu_dai_name = "omap-mcpdm",
                .codec_dai_name = "twl6040-legacy",
-               .platform_name = "omap-pcm-audio",
                .codec_name = "twl6040-codec",
                .init = omap_abe_twl6040_init,
                .ops = &omap_abe_ops,
@@ -224,9 +222,7 @@ static struct snd_soc_dai_link abe_twl6040_dai_links[] = {
        {
                .name = "DMIC",
                .stream_name = "DMIC Capture",
-               .cpu_dai_name = "omap-dmic",
                .codec_dai_name = "dmic-hifi",
-               .platform_name = "omap-pcm-audio",
                .codec_name = "dmic-codec",
                .init = omap_abe_dmic_init,
                .ops = &omap_abe_dmic_ops,
@@ -281,14 +277,14 @@ static int omap_abe_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "McPDM node is not provided\n");
                return -EINVAL;
        }
-       abe_twl6040_dai_links[0].cpu_dai_name  = NULL;
        abe_twl6040_dai_links[0].cpu_of_node = dai_node;
+       abe_twl6040_dai_links[0].platform_of_node = dai_node;
 
        dai_node = of_parse_phandle(node, "ti,dmic", 0);
        if (dai_node) {
                num_links = 2;
-               abe_twl6040_dai_links[1].cpu_dai_name  = NULL;
                abe_twl6040_dai_links[1].cpu_of_node = dai_node;
+               abe_twl6040_dai_links[1].platform_of_node = dai_node;
 
                priv->dmic_codec_dev = platform_device_register_simple(
                                                "dmic-codec", -1, NULL, 0);