Merge tag 'arc-5.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[linux.git] / sound / soc / cirrus / snappercl15.c

diff --git a/sound/soc/cirrus/snappercl15.c b/sound/soc/cirrus/snappercl15.c
index 2f5f27b0f58078c2f30cdd3c1e9f2fb1685e19c8..70c2f3e08d6d40881f8389bdd8a8e56772fa3528 100644 (file)
--- a/sound/soc/cirrus/snappercl15.c
+++ b/sound/soc/cirrus/snappercl15.c
@@ -60,16 +60,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 = {