ASoC: samsung: tobermory: 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/tobermory.c b/sound/soc/samsung/tobermory.c
index 14b11acb12a42f741f8b598ead73c10c8b07b397..ef51f289fbc73216b63f71fffc1e44ce3b2b119a 100644 (file)
--- a/sound/soc/samsung/tobermory.c
+++ b/sound/soc/samsung/tobermory.c
@@ -109,17 +109,19 @@ static struct snd_soc_ops tobermory_ops = {
        .hw_params = tobermory_hw_params,
 };
 
+SND_SOC_DAILINK_DEFS(cpu,
+       DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s.0")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("wm8962.1-001a", "wm8962")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("samsung-i2s.0")));
+
 static struct snd_soc_dai_link tobermory_dai[] = {
        {
                .name = "CPU",
                .stream_name = "CPU",
-               .cpu_dai_name = "samsung-i2s.0",
-               .codec_dai_name = "wm8962",
-               .platform_name = "samsung-i2s.0",
-               .codec_name = "wm8962.1-001a",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBM_CFM,
                .ops = &tobermory_ops,
+               SND_SOC_DAILINK_REG(cpu),
        },
 };