diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-07-06 12:25:26 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-06 12:25:26 +0100 |
| commit | 043b35f281f5f141e7a928d27492133ef33b8119 (patch) | |
| tree | 30a9598866d6b8d44ee6b3fe88506881f23e0203 /drivers | |
| parent | Merge branch 'asoc-5.2' into asoc-linus (diff) | |
| parent | ASoC: SOF: Intel: implement runtime idle for CNL/APL (diff) | |
| download | linux-dev-043b35f281f5f141e7a928d27492133ef33b8119.tar.xz linux-dev-043b35f281f5f141e7a928d27492133ef33b8119.zip | |
Merge branch 'asoc-5.3' into asoc-next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_hdmi.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 718b26276dbd..9f385979d1e6 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -58,6 +58,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; @@ -1085,12 +1088,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; |