]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: samsung: smdk_wm8994pcm: use modern dai_link style
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 6 Jun 2019 04:09:12 +0000 (13:09 +0900)
committerMark Brown <broonie@kernel.org>
Thu, 6 Jun 2019 20:27:35 +0000 (21:27 +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/samsung/smdk_wm8994pcm.c

index 43171d6457fa9d594c7e29f31084cb975761ae85..2e3dc7320c62e99a1656b9c5e6d5bde252819fc1 100644 (file)
@@ -89,17 +89,19 @@ static struct snd_soc_ops smdk_wm8994_pcm_ops = {
        .hw_params = smdk_wm8994_pcm_hw_params,
 };
 
+SND_SOC_DAILINK_DEFS(paif_pcm,
+       DAILINK_COMP_ARRAY(COMP_CPU("samsung-pcm.0")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("wm8994-codec", "wm8994-aif1")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("samsung-pcm.0")));
+
 static struct snd_soc_dai_link smdk_dai[] = {
        {
                .name = "WM8994 PAIF PCM",
                .stream_name = "Primary PCM",
-               .cpu_dai_name = "samsung-pcm.0",
-               .codec_dai_name = "wm8994-aif1",
-               .platform_name = "samsung-pcm.0",
-               .codec_name = "wm8994-codec",
                .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF |
                           SND_SOC_DAIFMT_CBS_CFS,
                .ops = &smdk_wm8994_pcm_ops,
+               SND_SOC_DAILINK_REG(paif_pcm),
        },
 };