mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
793f8ab62c
Add kernel patches for version 6.1. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
From ae6d666715a795257698f97caf1891d90a6a50e4 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Thu, 11 May 2023 16:08:15 +0100
|
|
Subject: [PATCH] drm/vc4: Use phys addresses for slave DMA config
|
|
|
|
Slave addresses for DMA are meant to be supplied as physical addresses
|
|
(contrary to what struct snd_dmaengine_dai_dma_data does).
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 13 ++++---------
|
|
1 file changed, 4 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -2719,7 +2719,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;
|
|
struct platform_device *codec_pdev;
|
|
- const __be32 *addr;
|
|
+ struct resource *iomem;
|
|
int index, len;
|
|
int ret;
|
|
|
|
@@ -2755,20 +2755,15 @@ static int vc4_hdmi_audio_init(struct vc
|
|
}
|
|
|
|
/*
|
|
- * Get the physical address of VC4_HD_MAI_DATA. We need to retrieve
|
|
- * the bus address specified in the DT, because the physical address
|
|
- * (the one returned by platform_get_resource()) is not appropriate
|
|
- * for DMA transfers.
|
|
- * This VC/MMU should probably be exposed to avoid this kind of hacks.
|
|
+ * Get the physical address of VC4_HD_MAI_DATA.
|
|
*/
|
|
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;
|
|
+ iomem = platform_get_resource(vc4_hdmi->pdev, IORESOURCE_MEM, index);
|
|
|
|
- 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 = iomem->start + mai_data->offset;
|
|
vc4_hdmi->audio.dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
|
|
vc4_hdmi->audio.dma_data.maxburst = 2;
|
|
|