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

index 667f4215dfc0f07dd58b02c92e7dc542ac5eb1f5..8f6396faec9be5bce7808d1ddd03502e07b64201 100644 (file)
 
 #define DRV_NAME "efika-audio-fabric"
 
+SND_SOC_DAILINK_DEFS(analog,
+       DAILINK_COMP_ARRAY(COMP_CPU("mpc5200-psc-ac97.0")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("stac9766-codec",
+                                     "stac9766-hifi-analog")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("mpc5200-pcm-audio")));
+
+SND_SOC_DAILINK_DEFS(iec958,
+       DAILINK_COMP_ARRAY(COMP_CPU("mpc5200-psc-ac97.1")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("stac9766-codec",
+                                     "stac9766-hifi-IEC958")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("mpc5200-pcm-audio")));
+
 static struct snd_soc_dai_link efika_fabric_dai[] = {
 {
        .name = "AC97",
        .stream_name = "AC97 Analog",
-       .codec_dai_name = "stac9766-hifi-analog",
-       .cpu_dai_name = "mpc5200-psc-ac97.0",
-       .platform_name = "mpc5200-pcm-audio",
-       .codec_name = "stac9766-codec",
+       SND_SOC_DAILINK_REG(analog),
 },
 {
        .name = "AC97",
        .stream_name = "AC97 IEC958",
-       .codec_dai_name = "stac9766-hifi-IEC958",
-       .cpu_dai_name = "mpc5200-psc-ac97.1",
-       .platform_name = "mpc5200-pcm-audio",
-       .codec_name = "stac9766-codec",
+       SND_SOC_DAILINK_REG(iec958),
 },
 };