ASoC: mediatek: mt8173-rt5650-rt5676: 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/mediatek/mt8173/mt8173-rt5650-rt5676.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
index d83cd039b413b34788281d49dbae3c58e23ca1f7..9d4dd97211548a8cb0c55a889039f9601d6649e8 100644 (file)
--- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
+++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
@@ -111,14 +111,6 @@ static int mt8173_rt5650_rt5676_init(struct snd_soc_pcm_runtime *runtime)
                                      &mt8173_rt5650_rt5676_jack);
 }
 
-static struct snd_soc_dai_link_component mt8173_rt5650_rt5676_codecs[] = {
-       {
-               .dai_name = "rt5645-aif1",
-       },
-       {
-               .dai_name = "rt5677-aif1",
-       },
-};
 
 enum {
        DAI_LINK_PLAYBACK,
@@ -129,47 +121,69 @@ enum {
        DAI_LINK_INTERCODEC
 };
 
+SND_SOC_DAILINK_DEFS(playback,
+       DAILINK_COMP_ARRAY(COMP_CPU("DL1")),
+       DAILINK_COMP_ARRAY(COMP_DUMMY()),
+       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
+SND_SOC_DAILINK_DEFS(capture,
+       DAILINK_COMP_ARRAY(COMP_CPU("VUL")),
+       DAILINK_COMP_ARRAY(COMP_DUMMY()),
+       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
+SND_SOC_DAILINK_DEFS(hdmi_pcm,
+       DAILINK_COMP_ARRAY(COMP_CPU("HDMI")),
+       DAILINK_COMP_ARRAY(COMP_DUMMY()),
+       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
+SND_SOC_DAILINK_DEFS(codec,
+       DAILINK_COMP_ARRAY(COMP_CPU("I2S")),
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5645-aif1"),
+                          COMP_CODEC(NULL, "rt5677-aif1")),
+       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
+SND_SOC_DAILINK_DEFS(hdmi_be,
+       DAILINK_COMP_ARRAY(COMP_CPU("HDMIO")),
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "i2s-hifi")),
+       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
+SND_SOC_DAILINK_DEFS(intercodec,
+       DAILINK_COMP_ARRAY(COMP_DUMMY()),
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5677-aif2")),
+       DAILINK_COMP_ARRAY(COMP_DUMMY()));
+
 /* Digital audio interface glue - connects codec <---> CPU */
 static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = {
        /* Front End DAI links */
        [DAI_LINK_PLAYBACK] = {
                .name = "rt5650_rt5676 Playback",
                .stream_name = "rt5650_rt5676 Playback",
-               .cpu_dai_name = "DL1",
-               .codec_name = "snd-soc-dummy",
-               .codec_dai_name = "snd-soc-dummy-dai",
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
                .dpcm_playback = 1,
+               SND_SOC_DAILINK_REG(playback),
        },
        [DAI_LINK_CAPTURE] = {
                .name = "rt5650_rt5676 Capture",
                .stream_name = "rt5650_rt5676 Capture",
-               .cpu_dai_name = "VUL",
-               .codec_name = "snd-soc-dummy",
-               .codec_dai_name = "snd-soc-dummy-dai",
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
                .dpcm_capture = 1,
+               SND_SOC_DAILINK_REG(capture),
        },
        [DAI_LINK_HDMI] = {
                .name = "HDMI",
                .stream_name = "HDMI PCM",
-               .cpu_dai_name = "HDMI",
-               .codec_name = "snd-soc-dummy",
-               .codec_dai_name = "snd-soc-dummy-dai",
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
                .dynamic = 1,
                .dpcm_playback = 1,
+               SND_SOC_DAILINK_REG(hdmi_pcm),
        },
 
        /* Back End DAI links */
        [DAI_LINK_CODEC_I2S] = {
                .name = "Codec",
-               .cpu_dai_name = "I2S",
                .no_pcm = 1,
-               .codecs = mt8173_rt5650_rt5676_codecs,
-               .num_codecs = 2,
                .init = mt8173_rt5650_rt5676_init,
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                           SND_SOC_DAIFMT_CBS_CFS,
@@ -177,26 +191,23 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = {
                .ignore_pmdown_time = 1,
                .dpcm_playback = 1,
                .dpcm_capture = 1,
+               SND_SOC_DAILINK_REG(codec),
        },
        [DAI_LINK_HDMI_I2S] = {
                .name = "HDMI BE",
-               .cpu_dai_name = "HDMIO",
                .no_pcm = 1,
-               .codec_dai_name = "i2s-hifi",
                .dpcm_playback = 1,
+               SND_SOC_DAILINK_REG(hdmi_be),
        },
        /* rt5676 <-> rt5650 intercodec link: Sets rt5676 I2S2 as master */
        [DAI_LINK_INTERCODEC] = {
                .name = "rt5650_rt5676 intercodec",
                .stream_name = "rt5650_rt5676 intercodec",
-               .cpu_dai_name = "snd-soc-dummy-dai",
-               .platform_name = "snd-soc-dummy",
                .no_pcm = 1,
-               .codec_dai_name = "rt5677-aif2",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                           SND_SOC_DAIFMT_CBM_CFM,
+               SND_SOC_DAILINK_REG(intercodec),
        },
-
 };
 
 static struct snd_soc_codec_conf mt8173_rt5650_rt5676_codec_conf[] = {
@@ -235,34 +246,34 @@ static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev)
        }
 
        for_each_card_prelinks(card, i, dai_link) {
-               if (dai_link->platform_name)
+               if (dai_link->platforms->name)
                        continue;
-               dai_link->platform_of_node = platform_node;
+               dai_link->platforms->of_node = platform_node;
        }
 
-       mt8173_rt5650_rt5676_codecs[0].of_node =
+       mt8173_rt5650_rt5676_dais[DAI_LINK_CODEC_I2S].codecs[0].of_node =
                of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 0);
-       if (!mt8173_rt5650_rt5676_codecs[0].of_node) {
+       if (!mt8173_rt5650_rt5676_dais[DAI_LINK_CODEC_I2S].codecs[0].of_node) {
                dev_err(&pdev->dev,
                        "Property 'audio-codec' missing or invalid\n");
                return -EINVAL;
        }
-       mt8173_rt5650_rt5676_codecs[1].of_node =
+       mt8173_rt5650_rt5676_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node =
                of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 1);
-       if (!mt8173_rt5650_rt5676_codecs[1].of_node) {
+       if (!mt8173_rt5650_rt5676_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node) {
                dev_err(&pdev->dev,
                        "Property 'audio-codec' missing or invalid\n");
                return -EINVAL;
        }
        mt8173_rt5650_rt5676_codec_conf[0].of_node =
-               mt8173_rt5650_rt5676_codecs[1].of_node;
+               mt8173_rt5650_rt5676_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node;
 
-       mt8173_rt5650_rt5676_dais[DAI_LINK_INTERCODEC].codec_of_node =
-               mt8173_rt5650_rt5676_codecs[1].of_node;
+       mt8173_rt5650_rt5676_dais[DAI_LINK_INTERCODEC].codecs->of_node =
+               mt8173_rt5650_rt5676_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node;
 
-       mt8173_rt5650_rt5676_dais[DAI_LINK_HDMI_I2S].codec_of_node =
+       mt8173_rt5650_rt5676_dais[DAI_LINK_HDMI_I2S].codecs->of_node =
                of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 2);
-       if (!mt8173_rt5650_rt5676_dais[DAI_LINK_HDMI_I2S].codec_of_node) {
+       if (!mt8173_rt5650_rt5676_dais[DAI_LINK_HDMI_I2S].codecs->of_node) {
                dev_err(&pdev->dev,
                        "Property 'audio-codec' missing or invalid\n");
                return -EINVAL;