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

index 5d6e61a4bb7e3d42d1095fb01db64e8feec272c1..5a13e36a2499d594fbf16eed7110e680671b5084 100644 (file)
@@ -94,17 +94,19 @@ static int ttc_pm860x_init(struct snd_soc_pcm_runtime *rtd)
 }
 
 /* ttc/td-dkb digital audio interface glue - connects codec <--> CPU */
+SND_SOC_DAILINK_DEFS(i2s,
+       DAILINK_COMP_ARRAY(COMP_CPU("pxa-ssp-dai.1")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("88pm860x-codec", "88pm860x-i2s")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("mmp-pcm-audio")));
+
 static struct snd_soc_dai_link ttc_pm860x_hifi_dai[] = {
 {
         .name = "88pm860x i2s",
         .stream_name = "audio playback",
-        .codec_name = "88pm860x-codec",
-        .platform_name = "mmp-pcm-audio",
-        .cpu_dai_name = "pxa-ssp-dai.1",
-        .codec_dai_name = "88pm860x-i2s",
         .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBM_CFM,
         .init = ttc_pm860x_init,
+        SND_SOC_DAILINK_REG(i2s),
 },
 };