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

index f1283634b22b068c1613dd547497fd1929f15e1f..589499fcd36dafc642379b3726225c04a7c8d20a 100644 (file)
@@ -117,17 +117,19 @@ static int byt_max98090_init(struct snd_soc_pcm_runtime *runtime)
                                       hs_jack_gpios);
 }
 
+SND_SOC_DAILINK_DEFS(baytrail,
+       DAILINK_COMP_ARRAY(COMP_CPU("baytrail-pcm-audio")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("i2c-193C9890:00", "HiFi")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("baytrail-pcm-audio")));
+
 static struct snd_soc_dai_link byt_max98090_dais[] = {
        {
                .name = "Baytrail Audio",
                .stream_name = "Audio",
-               .cpu_dai_name = "baytrail-pcm-audio",
-               .codec_dai_name = "HiFi",
-               .codec_name = "i2c-193C9890:00",
-               .platform_name = "baytrail-pcm-audio",
                .init = byt_max98090_init,
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                           SND_SOC_DAIFMT_CBS_CFS,
+               SND_SOC_DAILINK_REG(baytrail),
        },
 };