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

index 9cfefe4..66b69eb 100644 (file)
@@ -261,16 +261,19 @@ static const struct snd_kcontrol_new aic33_n810_controls[] = {
 };
 
 /* Digital audio interface glue - connects codec <--> CPU */
+SND_SOC_DAILINK_DEFS(aic33,
+       DAILINK_COMP_ARRAY(COMP_CPU("48076000.mcbsp")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("tlv320aic3x-codec.1-0018",
+                                     "tlv320aic3x-hifi")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("48076000.mcbsp")));
+
 static struct snd_soc_dai_link n810_dai = {
        .name = "TLV320AIC33",
        .stream_name = "AIC33",
-       .cpu_dai_name = "48076000.mcbsp",
-       .platform_name = "48076000.mcbsp",
-       .codec_name = "tlv320aic3x-codec.1-0018",
-       .codec_dai_name = "tlv320aic3x-hifi",
        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                   SND_SOC_DAIFMT_CBM_CFM,
        .ops = &n810_ops,
+       SND_SOC_DAILINK_REG(aic33),
 };
 
 /* Audio machine driver */