ASoC: rockchip: rk3399_gru_sound: 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/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c
index f2a51ae2b674d5a3107ab568bdc1842d6e746145..5e2700283fa89cf22c37f0688537051fde12a353 100644 (file)
--- a/sound/soc/rockchip/rk3399_gru_sound.c
+++ b/sound/soc/rockchip/rk3399_gru_sound.c
@@ -276,56 +276,85 @@ enum {
        DAILINK_RT5514_DSP,
 };
 
+SND_SOC_DAILINK_DEFS(cdndp,
+       DAILINK_COMP_ARRAY(COMP_EMPTY()),
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "spdif-hifi")),
+       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
+SND_SOC_DAILINK_DEFS(da7219,
+       DAILINK_COMP_ARRAY(COMP_EMPTY()),
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "da7219-hifi")),
+       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
+SND_SOC_DAILINK_DEFS(dmic,
+       DAILINK_COMP_ARRAY(COMP_EMPTY()),
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dmic-hifi")),
+       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
+SND_SOC_DAILINK_DEFS(max98357a,
+       DAILINK_COMP_ARRAY(COMP_EMPTY()),
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "HiFi")),
+       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
+SND_SOC_DAILINK_DEFS(rt5514,
+       DAILINK_COMP_ARRAY(COMP_EMPTY()),
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5514-aif1")),
+       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
+SND_SOC_DAILINK_DEFS(rt5514_dsp,
+       DAILINK_COMP_ARRAY(COMP_EMPTY()),
+       DAILINK_COMP_ARRAY(COMP_DUMMY()),
+       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
 static const struct snd_soc_dai_link rockchip_dais[] = {
        [DAILINK_CDNDP] = {
                .name = "DP",
                .stream_name = "DP PCM",
-               .codec_dai_name = "spdif-hifi",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBS_CFS,
+               SND_SOC_DAILINK_REG(cdndp),
        },
        [DAILINK_DA7219] = {
                .name = "DA7219",
                .stream_name = "DA7219 PCM",
-               .codec_dai_name = "da7219-hifi",
                .init = rockchip_sound_da7219_init,
                .ops = &rockchip_sound_da7219_ops,
                /* set da7219 as slave */
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBS_CFS,
+               SND_SOC_DAILINK_REG(da7219),
        },
        [DAILINK_DMIC] = {
                .name = "DMIC",
                .stream_name = "DMIC PCM",
-               .codec_dai_name = "dmic-hifi",
                .ops = &rockchip_sound_dmic_ops,
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBS_CFS,
+               SND_SOC_DAILINK_REG(dmic),
        },
        [DAILINK_MAX98357A] = {
                .name = "MAX98357A",
                .stream_name = "MAX98357A PCM",
-               .codec_dai_name = "HiFi",
                .ops = &rockchip_sound_max98357a_ops,
                /* set max98357a as slave */
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBS_CFS,
+               SND_SOC_DAILINK_REG(max98357a),
        },
        [DAILINK_RT5514] = {
                .name = "RT5514",
                .stream_name = "RT5514 PCM",
-               .codec_dai_name = "rt5514-aif1",
                .ops = &rockchip_sound_rt5514_ops,
                /* set rt5514 as slave */
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBS_CFS,
+               SND_SOC_DAILINK_REG(rt5514),
        },
        /* RT5514 DSP for voice wakeup via spi bus */
        [DAILINK_RT5514_DSP] = {
                .name = "RT5514 DSP",
                .stream_name = "Wake on Voice",
-               .codec_name = "snd-soc-dummy",
-               .codec_dai_name = "snd-soc-dummy-dai",
+               SND_SOC_DAILINK_REG(rt5514_dsp),
        },
 };
 
@@ -507,10 +536,10 @@ static int rockchip_sound_of_parse_dais(struct device *dev,
                dai = &card->dai_link[card->num_links++];
                *dai = rockchip_dais[index];
 
-               if (!dai->codec_name)
-                       dai->codec_of_node = np_codec;
-               dai->platform_of_node = np_cpu;
-               dai->cpu_of_node = np_cpu;
+               if (!dai->codecs->name)
+                       dai->codecs->of_node = np_codec;
+               dai->platforms->of_node = np_cpu;
+               dai->cpus->of_node = np_cpu;
 
                if (card->num_dapm_routes + rockchip_routes[index].num_routes >
                    num_routes) {