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

index b9e887ea60b2bdb84df0bab7dd9641385634b908..fab3db9fdb98f28df797090a618cbc55bd82dd6d 100644 (file)
@@ -153,18 +153,20 @@ static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd)
        return err;
 }
 
+SND_SOC_DAILINK_DEFS(wm8987,
+       DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s.0")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("wm8750.0-0x1a", "wm8750-hifi")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("samsung-i2s.0")));
+
 static struct snd_soc_dai_link smartq_dai[] = {
        {
                .name           = "wm8987",
                .stream_name    = "SmartQ Hi-Fi",
-               .cpu_dai_name   = "samsung-i2s.0",
-               .codec_dai_name = "wm8750-hifi",
-               .platform_name  = "samsung-i2s.0",
-               .codec_name     = "wm8750.0-0x1a",
                .init           = smartq_wm8987_init,
                .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                                  SND_SOC_DAIFMT_CBS_CFS,
                .ops            = &smartq_hifi_ops,
+               SND_SOC_DAILINK_REG(wm8987),
        },
 };