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

index dea4909..0b4efcc 100644 (file)
@@ -65,16 +65,19 @@ static const struct snd_soc_dapm_route audio_map[] = {
        {"MICIN", NULL, "Mic Jack"},
 };
 
+SND_SOC_DAILINK_DEFS(aic23,
+       DAILINK_COMP_ARRAY(COMP_CPU("ep93xx-i2s")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("tlv320aic23-codec.0-001a",
+                                     "tlv320aic23-hifi")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("ep93xx-i2s")));
+
 static struct snd_soc_dai_link snappercl15_dai = {
        .name           = "tlv320aic23",
        .stream_name    = "AIC23",
-       .cpu_dai_name   = "ep93xx-i2s",
-       .codec_dai_name = "tlv320aic23-hifi",
-       .codec_name     = "tlv320aic23-codec.0-001a",
-       .platform_name  = "ep93xx-i2s",
        .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                          SND_SOC_DAIFMT_CBS_CFS,
        .ops            = &snappercl15_ops,
+       SND_SOC_DAILINK_REG(aic23),
 };
 
 static struct snd_soc_card snd_soc_snappercl15 = {