ASoC: samsung: littlemill: 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/samsung/littlemill.c b/sound/soc/samsung/littlemill.c
index cd70b06cc99d128856283dfebecd54fe8d36c77e..6132cee8550b34bed79c0960ca539301d1434811 100644 (file)
--- a/sound/soc/samsung/littlemill.c
+++ b/sound/soc/samsung/littlemill.c
@@ -142,28 +142,33 @@ static const struct snd_soc_pcm_stream baseband_params = {
        .channels_max = 2,
 };
 
+SND_SOC_DAILINK_DEFS(cpu,
+       DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s.0")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("wm8994-codec", "wm8994-aif1")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("samsung-i2s.0")));
+
+SND_SOC_DAILINK_DEFS(baseband,
+       DAILINK_COMP_ARRAY(COMP_CPU("wm8994-aif2")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("wm1250-ev1.1-0027",
+                                     "wm1250-ev1")));
+
 static struct snd_soc_dai_link littlemill_dai[] = {
        {
                .name = "CPU",
                .stream_name = "CPU",
-               .cpu_dai_name = "samsung-i2s.0",
-               .codec_dai_name = "wm8994-aif1",
-               .platform_name = "samsung-i2s.0",
-               .codec_name = "wm8994-codec",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBM_CFM,
                .ops = &littlemill_ops,
+               SND_SOC_DAILINK_REG(cpu),
        },
        {
                .name = "Baseband",
                .stream_name = "Baseband",
-               .cpu_dai_name = "wm8994-aif2",
-               .codec_dai_name = "wm1250-ev1",
-               .codec_name = "wm1250-ev1.1-0027",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBM_CFM,
                .ignore_suspend = 1,
                .params = &baseband_params,
+               SND_SOC_DAILINK_REG(baseband),
        },
 };