ASoC: vc4: vc4_htmi: use modern dai_link style

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>

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 99fc8569e0f5285d188cb481845905a759ba713a..6beac1ca1f27100435d1077bc3f63541af90f16e 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -69,6 +69,9 @@
 struct vc4_hdmi_audio {
        struct snd_soc_card card;
        struct snd_soc_dai_link link;
+       struct snd_soc_dai_link_component cpu;
+       struct snd_soc_dai_link_component codec;
+       struct snd_soc_dai_link_component platform;
        int samplerate;
        int channels;
        struct snd_dmaengine_dai_dma_data dma_data;
@@ -1096,12 +1099,20 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *hdmi)
                return ret;
        }
 
+       dai_link->cpus          = &hdmi->audio.cpu;
+       dai_link->codecs        = &hdmi->audio.codec;
+       dai_link->platforms     = &hdmi->audio.platform;
+
+       dai_link->num_cpus      = 1;
+       dai_link->num_codecs    = 1;
+       dai_link->num_platforms = 1;
+
        dai_link->name = "MAI";
        dai_link->stream_name = "MAI PCM";
-       dai_link->codec_dai_name = vc4_hdmi_audio_codec_dai_drv.name;
-       dai_link->cpu_dai_name = dev_name(dev);
-       dai_link->codec_name = dev_name(dev);
-       dai_link->platform_name = dev_name(dev);
+       dai_link->codecs->dai_name = vc4_hdmi_audio_codec_dai_drv.name;
+       dai_link->cpus->dai_name = dev_name(dev);
+       dai_link->codecs->name = dev_name(dev);
+       dai_link->platforms->name = dev_name(dev);
 
        card->dai_link = dai_link;
        card->num_links = 1;