ASoC: fsl: imx-spdif: use modern dai_link style

ASoC is now supporting modern style dai_link
(= snd_soc_dai_link_component) for CPU/Codec/Platform.
This patch switches to use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/fsl/imx-spdif.c b/sound/soc/fsl/imx-spdif.c
index 4f7f210beb18426f62240d544484bb96a7f53f1b..6c4dadf60355102b8b0eebab275f4088b41b6181 100644 (file)
--- a/sound/soc/fsl/imx-spdif.c
+++ b/sound/soc/fsl/imx-spdif.c
@@ -15,6 +15,7 @@ static int imx_spdif_audio_probe(struct platform_device *pdev)
 {
        struct device_node *spdif_np, *np = pdev->dev.of_node;
        struct imx_spdif_data *data;
+       struct snd_soc_dai_link_component *comp;
        int ret = 0;
 
        spdif_np = of_parse_phandle(np, "spdif-controller", 0);
@@ -25,17 +26,26 @@ static int imx_spdif_audio_probe(struct platform_device *pdev)
        }
 
        data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
-       if (!data) {
+       comp = devm_kzalloc(&pdev->dev, 3 * sizeof(*comp), GFP_KERNEL);
+       if (!data || !comp) {
                ret = -ENOMEM;
                goto end;
        }
 
+       data->dai.cpus          = &comp[0];
+       data->dai.codecs        = &comp[1];
+       data->dai.platforms     = &comp[2];
+
+       data->dai.num_cpus      = 1;
+       data->dai.num_codecs    = 1;
+       data->dai.num_platforms = 1;
+
        data->dai.name = "S/PDIF PCM";
        data->dai.stream_name = "S/PDIF PCM";
-       data->dai.codec_dai_name = "snd-soc-dummy-dai";
-       data->dai.codec_name = "snd-soc-dummy";
-       data->dai.cpu_of_node = spdif_np;
-       data->dai.platform_of_node = spdif_np;
+       data->dai.codecs->dai_name = "snd-soc-dummy-dai";
+       data->dai.codecs->name = "snd-soc-dummy";
+       data->dai.cpus->of_node = spdif_np;
+       data->dai.platforms->of_node = spdif_np;
        data->dai.playback_only = true;
        data->dai.capture_only = true;