ASoC: ti: ams-delta: use modern dai_link style
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 6 Jun 2019 04:12:48 +0000 (13:12 +0900)
committerMark Brown <broonie@kernel.org>
Thu, 6 Jun 2019 20:35:59 +0000 (21:35 +0100)
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>
sound/soc/ti/ams-delta.c

index b9611db14c86fcac386ecdda8647ecb07203cecd..50ca3c42642f8b5418ed36ec4be5c0667ac2288f 100644 (file)
@@ -518,17 +518,19 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd)
 }
 
 /* DAI glue - connects codec <--> CPU */
+SND_SOC_DAILINK_DEFS(cx20442,
+       DAILINK_COMP_ARRAY(COMP_CPU("omap-mcbsp.1")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("cx20442-codec", "cx20442-voice")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("omap-mcbsp.1")));
+
 static struct snd_soc_dai_link ams_delta_dai_link = {
        .name = "CX20442",
        .stream_name = "CX20442",
-       .cpu_dai_name = "omap-mcbsp.1",
-       .codec_dai_name = "cx20442-voice",
        .init = ams_delta_cx20442_init,
-       .platform_name = "omap-mcbsp.1",
-       .codec_name = "cx20442-codec",
        .ops = &ams_delta_ops,
        .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF |
                   SND_SOC_DAIFMT_CBM_CFM,
+       SND_SOC_DAILINK_REG(cx20442),
 };
 
 /* Audio card driver */