Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: mediatek: Add HDMI dai-links in the mt8173-rt5650-rt5676 machine driver

This creates pcmC0D2p for the HDMI playback in the same card.

Signed-off-by: Koro Chen <koro.chen@mediatek.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Koro Chen and committed by
Mark Brown
c0133e3b d349caeb

+31 -2
+3 -2
Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5676.txt
··· 1 - MT8173 with RT5650 RT5676 CODECS 1 + MT8173 with RT5650 RT5676 CODECS and HDMI via I2S 2 2 3 3 Required properties: 4 4 - compatible : "mediatek,mt8173-rt5650-rt5676" 5 5 - mediatek,audio-codec: the phandles of rt5650 and rt5676 codecs 6 + and of the hdmi encoder node 6 7 - mediatek,platform: the phandle of MT8173 ASoC platform 7 8 8 9 Example: 9 10 10 11 sound { 11 12 compatible = "mediatek,mt8173-rt5650-rt5676"; 12 - mediatek,audio-codec = <&rt5650 &rt5676>; 13 + mediatek,audio-codec = <&rt5650 &rt5676 &hdmi0>; 13 14 mediatek,platform = <&afe>; 14 15 }; 15 16
+1
sound/soc/mediatek/Kconfig
··· 43 43 depends on SND_SOC_MEDIATEK && I2C 44 44 select SND_SOC_RT5645 45 45 select SND_SOC_RT5677 46 + select SND_SOC_HDMI_CODEC 46 47 help 47 48 This adds ASoC driver for Mediatek MT8173 boards 48 49 with the RT5650 and RT5676 codecs.
+27
sound/soc/mediatek/mt8173-rt5650-rt5676.c
··· 134 134 enum { 135 135 DAI_LINK_PLAYBACK, 136 136 DAI_LINK_CAPTURE, 137 + DAI_LINK_HDMI, 137 138 DAI_LINK_CODEC_I2S, 139 + DAI_LINK_HDMI_I2S, 138 140 DAI_LINK_INTERCODEC 139 141 }; 140 142 ··· 163 161 .dynamic = 1, 164 162 .dpcm_capture = 1, 165 163 }, 164 + [DAI_LINK_HDMI] = { 165 + .name = "HDMI", 166 + .stream_name = "HDMI PCM", 167 + .cpu_dai_name = "HDMI", 168 + .codec_name = "snd-soc-dummy", 169 + .codec_dai_name = "snd-soc-dummy-dai", 170 + .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, 171 + .dynamic = 1, 172 + .dpcm_playback = 1, 173 + }, 166 174 167 175 /* Back End DAI links */ 168 176 [DAI_LINK_CODEC_I2S] = { ··· 188 176 .ignore_pmdown_time = 1, 189 177 .dpcm_playback = 1, 190 178 .dpcm_capture = 1, 179 + }, 180 + [DAI_LINK_HDMI_I2S] = { 181 + .name = "HDMI BE", 182 + .cpu_dai_name = "HDMIO", 183 + .no_pcm = 1, 184 + .codec_dai_name = "i2s-hifi", 185 + .dpcm_playback = 1, 191 186 }, 192 187 /* rt5676 <-> rt5650 intercodec link: Sets rt5676 I2S2 as master */ 193 188 [DAI_LINK_INTERCODEC] = { ··· 269 250 270 251 mt8173_rt5650_rt5676_dais[DAI_LINK_INTERCODEC].codec_of_node = 271 252 mt8173_rt5650_rt5676_codecs[1].of_node; 253 + 254 + mt8173_rt5650_rt5676_dais[DAI_LINK_HDMI_I2S].codec_of_node = 255 + of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 2); 256 + if (!mt8173_rt5650_rt5676_dais[DAI_LINK_HDMI_I2S].codec_of_node) { 257 + dev_err(&pdev->dev, 258 + "Property 'audio-codec' missing or invalid\n"); 259 + return -EINVAL; 260 + } 272 261 273 262 card->dev = &pdev->dev; 274 263 platform_set_drvdata(pdev, card);