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

index df902d82145e300e0431116c494b90b8e1a37d8c..483043f1650f378c448206ae6bf145a71a80d32a 100644 (file)
@@ -180,18 +180,20 @@ static struct snd_soc_ops byt_rt5640_ops = {
        .hw_params = byt_rt5640_hw_params,
 };
 
+SND_SOC_DAILINK_DEFS(audio,
+       DAILINK_COMP_ARRAY(COMP_CPU("baytrail-pcm-audio")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC5640:00", "rt5640-aif1")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("baytrail-pcm-audio")));
+
 static struct snd_soc_dai_link byt_rt5640_dais[] = {
        {
                .name = "Baytrail Audio",
                .stream_name = "Audio",
-               .cpu_dai_name = "baytrail-pcm-audio",
-               .codec_dai_name = "rt5640-aif1",
-               .codec_name = "i2c-10EC5640:00",
-               .platform_name = "baytrail-pcm-audio",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                           SND_SOC_DAIFMT_CBS_CFS,
                .init = byt_rt5640_init,
                .ops = &byt_rt5640_ops,
+               SND_SOC_DAILINK_REG(audio),
        },
 };