OSDN Git Service

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

index 1dcc1b2..4b247e9 100644 (file)
@@ -72,18 +72,21 @@ static struct snd_soc_ops rx1950_ops = {
 };
 
 /* s3c24xx digital audio interface glue - connects codec <--> CPU */
+SND_SOC_DAILINK_DEFS(uda1380,
+       DAILINK_COMP_ARRAY(COMP_CPU("s3c24xx-iis")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("uda1380-codec.0-001a",
+                                     "uda1380-hifi")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("s3c24xx-iis")));
+
 static struct snd_soc_dai_link rx1950_uda1380_dai[] = {
        {
                .name           = "uda1380",
                .stream_name    = "UDA1380 Duplex",
-               .cpu_dai_name   = "s3c24xx-iis",
-               .codec_dai_name = "uda1380-hifi",
                .init           = rx1950_uda1380_init,
-               .platform_name  = "s3c24xx-iis",
-               .codec_name     = "uda1380-codec.0-001a",
                .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                                  SND_SOC_DAIFMT_CBS_CFS,
                .ops            = &rx1950_ops,
+               SND_SOC_DAILINK_REG(uda1380),
        },
 };