ASoC: cirrus: edb93xx: use modern dai_link style
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 6 Jun 2019 04:14:18 +0000 (13:14 +0900)
committerMark Brown <broonie@kernel.org>
Thu, 6 Jun 2019 20:40:30 +0000 (21:40 +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/cirrus/edb93xx.c

index f678b4c1514afd64df690b8c746eaa35b3766c40..1528d1410ff2819a4d4d814ae1f920e941e3d3d5 100644 (file)
@@ -60,16 +60,18 @@ static const struct snd_soc_ops edb93xx_ops = {
        .hw_params      = edb93xx_hw_params,
 };
 
+SND_SOC_DAILINK_DEFS(hifi,
+       DAILINK_COMP_ARRAY(COMP_CPU("ep93xx-i2s")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("spi0.0", "cs4271-hifi")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("ep93xx-i2s")));
+
 static struct snd_soc_dai_link edb93xx_dai = {
        .name           = "CS4271",
        .stream_name    = "CS4271 HiFi",
-       .platform_name  = "ep93xx-i2s",
-       .cpu_dai_name   = "ep93xx-i2s",
-       .codec_name     = "spi0.0",
-       .codec_dai_name = "cs4271-hifi",
        .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                          SND_SOC_DAIFMT_CBS_CFS,
        .ops            = &edb93xx_ops,
+       SND_SOC_DAILINK_REG(hifi),
 };
 
 static struct snd_soc_card snd_soc_edb93xx = {