ASoC: rockchip: rockchip_max98090: 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>

1 files changed, 11 insertions, 6 deletions

diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c
index 789d6f1e2b5f..fcb5c06a0fe2 100644
--- a/sound/soc/rockchip/rockchip_max98090.c
+++ b/sound/soc/rockchip/rockchip_max98090.c
@@ -123,14 +123,19 @@ static const struct snd_soc_ops rk_aif1_ops = {
         .hw_params = rk_aif1_hw_params,
 };
 
+SND_SOC_DAILINK_DEFS(hifi,
+        DAILINK_COMP_ARRAY(COMP_EMPTY()),
+        DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "HiFi")),
+        DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
 static struct snd_soc_dai_link rk_dailink = {
         .name = "max98090",
         .stream_name = "Audio",
-        .codec_dai_name = "HiFi",
         .ops = &rk_aif1_ops,
         /* set max98090 as slave */
         .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                 SND_SOC_DAIFMT_CBS_CFS,
+        SND_SOC_DAILINK_REG(hifi),
 };
 
 static int rk_98090_headset_init(struct snd_soc_component *component);
@@ -184,23 +189,23 @@ static int snd_rk_mc_probe(struct platform_device *pdev)
         /* register the soc card */
         card->dev = &pdev->dev;
 
-        rk_dailink.codec_of_node = of_parse_phandle(np,
+        rk_dailink.codecs->of_node = of_parse_phandle(np,
                         "rockchip,audio-codec", 0);
-        if (!rk_dailink.codec_of_node) {
+        if (!rk_dailink.codecs->of_node) {
                 dev_err(&pdev->dev,
                         "Property 'rockchip,audio-codec' missing or invalid\n");
                 return -EINVAL;
         }
 
-        rk_dailink.cpu_of_node = of_parse_phandle(np,
+        rk_dailink.cpus->of_node = of_parse_phandle(np,
                         "rockchip,i2s-controller", 0);
-        if (!rk_dailink.cpu_of_node) {
+        if (!rk_dailink.cpus->of_node) {
                 dev_err(&pdev->dev,
                         "Property 'rockchip,i2s-controller' missing or invalid\n");
                 return -EINVAL;
         }
 
-        rk_dailink.platform_of_node = rk_dailink.cpu_of_node;
+        rk_dailink.platforms->of_node = rk_dailink.cpus->of_node;
 
         rk_98090_headset_dev.codec_of_node = of_parse_phandle(np,
                         "rockchip,headset-codec", 0);