mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 05:38:00 +00:00
51db334005
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.54 Removed upstreamed: generic/backport-6.6/780-24-v6.12-r8169-disable-ALDPS-per-default-for-RTL8125.patch[1] generic/pending-6.6/360-selftests-bpf-portability-of-unprivileged-tests.patch[2] Manually rebased: bcm53xx/patches-6.6/180-usb-xhci-add-support-for-performing-fake-doorbell.patch bmips/patches-6.6/200-mips-bmips-automatically-detect-CPU-frequency.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.54&id=50d062b6cc90c45a0de54e9bd9903c82777d66bf 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.54&id=103c0431c7fb4790affea121126840dbfb146341 Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/16602 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
From 3d4f30269402f795f6a4054ced3bfdcbdaddc357 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Thu, 11 May 2023 16:08:15 +0100
|
|
Subject: [PATCH 1127/1135] 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 | 14 +++++---------
|
|
1 file changed, 5 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -2831,7 +2831,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;
|
|
|
|
@@ -2867,22 +2867,18 @@ 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;
|
|
|
|
- addr = of_get_address(dev->of_node, index, NULL, NULL);
|
|
- if (!addr)
|
|
+ iomem = platform_get_resource(vc4_hdmi->pdev, IORESOURCE_MEM, index);
|
|
+ if (!iomem)
|
|
return -EINVAL;
|
|
|
|
- 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;
|
|
|