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

index f05f9e03f07d8ef39f0cf194bd73894755eec0c9..949d2e0299625594b2f873c6e4c6f140c2f63ad1 100644 (file)
@@ -78,16 +78,18 @@ static const struct snd_soc_ops jive_ops = {
        .hw_params      = jive_hw_params,
 };
 
+SND_SOC_DAILINK_DEFS(wm8750,
+       DAILINK_COMP_ARRAY(COMP_CPU("s3c2412-i2s")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("wm8750.0-001a", "wm8750-hifi")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("s3c2412-i2s")));
+
 static struct snd_soc_dai_link jive_dai = {
        .name           = "wm8750",
        .stream_name    = "WM8750",
-       .cpu_dai_name   = "s3c2412-i2s",
-       .codec_dai_name = "wm8750-hifi",
-       .platform_name  = "s3c2412-i2s",
-       .codec_name     = "wm8750.0-001a",
        .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                          SND_SOC_DAIFMT_CBS_CFS,
        .ops            = &jive_ops,
+       SND_SOC_DAILINK_REG(wm8750),
 };
 
 /* jive audio machine driver */