drm/vc4: hdmi: Use reg-names to retrieve the HDMI audio registers (094864bd) · Commits · 戴 / test

The register range used for audio setup in the previous generations of SoC were always the second range in the device tree. However, now that the BCM2711 has way more register ranges, it makes sense to retrieve it by names for it, while preserving the id-based lookup as a fallback. Signed-off-by:

Dave Stevenson <dave.stevenson@raspberrypi.com> Signed-off-by:

Maxime Ripard <maxime@cerno.tech> Tested-by:

Chanwoo Choi <cw00.choi@samsung.com> Tested-by:

Hoegeun Kwon <hoegeun.kwon@samsung.com> Tested-by:

Stefan Wahren <stefan.wahren@i2se.com> Link: https://patchwork.freedesktop.org/patch/msgid/a1ba5605fe1006a1ead5262ef3d66ea5d0750381.1599120059.git-series.maxime@cerno.tech

drivers/gpu/drm/vc4/vc4_hdmi.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -953,6 +953,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi)
		struct snd_soc_card *card = &vc4_hdmi->audio.card;
		struct device *dev = &vc4_hdmi->pdev->dev;
		const __be32 *addr;
		int index;
		int ret;

		if (!of_find_property(dev->of_node, "dmas", NULL)) {
		@@ -973,7 +974,13 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi)
		* for DMA transfers.
		* This VC/MMU should probably be exposed to avoid this kind of hacks.
		*/
		addr = of_get_address(dev->of_node, 1, NULL, NULL);
		index = of_property_match_string(dev->of_node, "reg-names", "hd");
		/* Before BCM2711, we don't have a named register range */
		if (index < 0)
		index = 1;

		addr = of_get_address(dev->of_node, index, NULL, NULL);

		vc4_hdmi->audio.dma_data.addr = be32_to_cpup(addr) + mai_data->offset;
		vc4_hdmi->audio.dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
		vc4_hdmi->audio.dma_data.maxburst = 2;

Admin message