]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: sh: migor: use modern dai_link style
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 6 Jun 2019 04:13:20 +0000 (13:13 +0900)
committerMark Brown <broonie@kernel.org>
Thu, 6 Jun 2019 20:37:24 +0000 (21:37 +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/sh/migor.c

index 8739c9f60672ced9588c05677e9affeb70f38c6b..991557e25eba66fc39a8e085a29da7d6ec4e30a6 100644 (file)
@@ -123,16 +123,18 @@ static const struct snd_soc_dapm_route audio_map[] = {
 };
 
 /* migor digital audio interface glue - connects codec <--> CPU */
+SND_SOC_DAILINK_DEFS(wm8978,
+       DAILINK_COMP_ARRAY(COMP_CPU("siu-pcm-audio")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("wm8978.0-001a", "wm8978-hifi")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("siu-pcm-audio")));
+
 static struct snd_soc_dai_link migor_dai = {
        .name = "wm8978",
        .stream_name = "WM8978",
-       .cpu_dai_name = "siu-pcm-audio",
-       .codec_dai_name = "wm8978-hifi",
-       .platform_name = "siu-pcm-audio",
-       .codec_name = "wm8978.0-001a",
        .dai_fmt = SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_I2S |
                   SND_SOC_DAIFMT_CBS_CFS,
        .ops = &migor_dai_ops,
+       SND_SOC_DAILINK_REG(wm8978),
 };
 
 /* migor audio machine driver */