36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 7a463d59a0539cdf79ee6f1fe6c52f0a487ee63e Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Wed, 25 Mar 2020 18:11:41 +0000
|
|
Subject: [PATCH] drm/vc4: Use reg-names to configure HDMI audio.
|
|
|
|
HDMI audio configuration was using fixed index numbers to
|
|
load in DT register settings.
|
|
Switch to using reg-names for flexibility and to match Pi4.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -1097,6 +1097,7 @@ static int vc4_hdmi_audio_init(struct vc
|
|
struct snd_soc_card *card = &vc4_hdmi->audio.card;
|
|
struct device *dev = &vc4_hdmi->pdev->dev;
|
|
const __be32 *addr;
|
|
+ int index;
|
|
int ret;
|
|
int len;
|
|
|
|
@@ -1122,7 +1123,9 @@ static int vc4_hdmi_audio_init(struct vc
|
|
* 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");
|
|
+ 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;
|