ASoC: tegra: tegra_wm8753: 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/tegra/tegra_wm8753.c b/sound/soc/tegra/tegra_wm8753.c
index 23a810e..8492b3d 100644 (file)
--- a/sound/soc/tegra/tegra_wm8753.c
+++ b/sound/soc/tegra/tegra_wm8753.c
@@ -98,14 +98,19 @@ static const struct snd_soc_dapm_widget tegra_wm8753_dapm_widgets[] = {
        SND_SOC_DAPM_MIC("Mic Jack", NULL),
 };
 
+SND_SOC_DAILINK_DEFS(pcm,
+       DAILINK_COMP_ARRAY(COMP_EMPTY()),
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm8753-hifi")),
+       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
 static struct snd_soc_dai_link tegra_wm8753_dai = {
        .name = "WM8753",
        .stream_name = "WM8753 PCM",
-       .codec_dai_name = "wm8753-hifi",
        .ops = &tegra_wm8753_ops,
        .dai_fmt = SND_SOC_DAIFMT_I2S |
                        SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBS_CFS,
+       SND_SOC_DAILINK_REG(pcm),
 };
 
 static struct snd_soc_card snd_soc_tegra_wm8753 = {
@@ -142,25 +147,25 @@ static int tegra_wm8753_driver_probe(struct platform_device *pdev)
        if (ret)
                goto err;
 
-       tegra_wm8753_dai.codec_of_node = of_parse_phandle(np,
+       tegra_wm8753_dai.codecs->of_node = of_parse_phandle(np,
                        "nvidia,audio-codec", 0);
-       if (!tegra_wm8753_dai.codec_of_node) {
+       if (!tegra_wm8753_dai.codecs->of_node) {
                dev_err(&pdev->dev,
                        "Property 'nvidia,audio-codec' missing or invalid\n");
                ret = -EINVAL;
                goto err;
        }
 
-       tegra_wm8753_dai.cpu_of_node = of_parse_phandle(np,
+       tegra_wm8753_dai.cpus->of_node = of_parse_phandle(np,
                        "nvidia,i2s-controller", 0);
-       if (!tegra_wm8753_dai.cpu_of_node) {
+       if (!tegra_wm8753_dai.cpus->of_node) {
                dev_err(&pdev->dev,
                        "Property 'nvidia,i2s-controller' missing or invalid\n");
                ret = -EINVAL;
                goto err;
        }
 
-       tegra_wm8753_dai.platform_of_node = tegra_wm8753_dai.cpu_of_node;
+       tegra_wm8753_dai.platforms->of_node = tegra_wm8753_dai.cpus->of_node;
 
        ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev);
        if (ret)