]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: samsung: h1940_uda1380: use modern dai_link style
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 6 Jun 2019 04:09:25 +0000 (13:09 +0900)
committerMark Brown <broonie@kernel.org>
Thu, 6 Jun 2019 20:28:13 +0000 (21:28 +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/h1940_uda1380.c

index 95925c4a596495a13e66a41a67ebda69be6db02c..a95c34e53a2b901904247589165f455f2595113b 100644 (file)
@@ -165,18 +165,20 @@ static int h1940_uda1380_init(struct snd_soc_pcm_runtime *rtd)
 }
 
 /* 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 h1940_uda1380_dai[] = {
        {
                .name           = "uda1380",
                .stream_name    = "UDA1380 Duplex",
-               .cpu_dai_name   = "s3c24xx-iis",
-               .codec_dai_name = "uda1380-hifi",
                .init           = h1940_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            = &h1940_ops,
+               SND_SOC_DAILINK_REG(uda1380),
        },
 };