ASoC: pxa: spitz: use modern dai_link style
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 6 Jun 2019 04:12:25 +0000 (13:12 +0900)
committerMark Brown <broonie@kernel.org>
Thu, 6 Jun 2019 20:34:59 +0000 (21:34 +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/pxa/spitz.c

index 1671da648e95985ce97db086082ce43e1662c5c5..7973466b09485b3825a739a7ecbdbd9a4a2cd621 100644 (file)
@@ -257,16 +257,18 @@ static const struct snd_kcontrol_new wm8750_spitz_controls[] = {
 };
 
 /* spitz digital audio interface glue - connects codec <--> CPU */
+SND_SOC_DAILINK_DEFS(wm8750,
+       DAILINK_COMP_ARRAY(COMP_CPU("pxa2xx-i2s")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("wm8750.0-001b", "wm8750-hifi")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("pxa-pcm-audio")));
+
 static struct snd_soc_dai_link spitz_dai = {
        .name = "wm8750",
        .stream_name = "WM8750",
-       .cpu_dai_name = "pxa2xx-i2s",
-       .codec_dai_name = "wm8750-hifi",
-       .platform_name = "pxa-pcm-audio",
-       .codec_name = "wm8750.0-001b",
        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                   SND_SOC_DAIFMT_CBS_CFS,
        .ops = &spitz_ops,
+       SND_SOC_DAILINK_REG(wm8750),
 };
 
 /* spitz audio machine driver */