mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
66 lines
2.0 KiB
Diff
66 lines
2.0 KiB
Diff
|
From 6ecbde16d1e4f1ffd8e7e7e535f01942df8963f4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
||
|
|
Date: Thu, 11 May 2023 10:07:45 +0100
|
||
|
|
Subject: [PATCH] ASoC: bcm2835-i2s: Use phys addresses for DAI DMA
|
||
|
|
|
||
|
|
Contrary to what struct snd_dmaengine_dai_dma_data suggests, the
|
||
|
|
configuration of addresses of DMA slave interfaces should be done in
|
||
|
|
CPU physical addresses.
|
||
|
|
|
||
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||
|
|
---
|
||
|
|
sound/soc/bcm/bcm2835-i2s.c | 18 ++++--------------
|
||
|
|
1 file changed, 4 insertions(+), 14 deletions(-)
|
||
|
|
|
||
|
|
--- a/sound/soc/bcm/bcm2835-i2s.c
|
||
|
|
+++ b/sound/soc/bcm/bcm2835-i2s.c
|
||
|
|
@@ -30,7 +30,6 @@
|
||
|
|
#include <linux/init.h>
|
||
|
|
#include <linux/io.h>
|
||
|
|
#include <linux/module.h>
|
||
|
|
-#include <linux/of_address.h>
|
||
|
|
#include <linux/slab.h>
|
||
|
|
|
||
|
|
#include <sound/core.h>
|
||
|
|
@@ -830,8 +829,7 @@ static int bcm2835_i2s_probe(struct plat
|
||
|
|
struct bcm2835_i2s_dev *dev;
|
||
|
|
int ret;
|
||
|
|
void __iomem *base;
|
||
|
|
- const __be32 *addr;
|
||
|
|
- dma_addr_t dma_base;
|
||
|
|
+ struct resource *res;
|
||
|
|
|
||
|
|
dev = devm_kzalloc(&pdev->dev, sizeof(*dev),
|
||
|
|
GFP_KERNEL);
|
||
|
|
@@ -846,7 +844,7 @@ static int bcm2835_i2s_probe(struct plat
|
||
|
|
"could not get clk\n");
|
||
|
|
|
||
|
|
/* Request ioarea */
|
||
|
|
- base = devm_platform_ioremap_resource(pdev, 0);
|
||
|
|
+ base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
|
||
|
|
if (IS_ERR(base))
|
||
|
|
return PTR_ERR(base);
|
||
|
|
|
||
|
|
@@ -855,19 +853,11 @@ static int bcm2835_i2s_probe(struct plat
|
||
|
|
if (IS_ERR(dev->i2s_regmap))
|
||
|
|
return PTR_ERR(dev->i2s_regmap);
|
||
|
|
|
||
|
|
- /* Set the DMA address - we have to parse DT ourselves */
|
||
|
|
- addr = of_get_address(pdev->dev.of_node, 0, NULL, NULL);
|
||
|
|
- if (!addr) {
|
||
|
|
- dev_err(&pdev->dev, "could not get DMA-register address\n");
|
||
|
|
- return -EINVAL;
|
||
|
|
- }
|
||
|
|
- dma_base = be32_to_cpup(addr);
|
||
|
|
-
|
||
|
|
dev->dma_data[SNDRV_PCM_STREAM_PLAYBACK].addr =
|
||
|
|
- dma_base + BCM2835_I2S_FIFO_A_REG;
|
||
|
|
+ res->start + BCM2835_I2S_FIFO_A_REG;
|
||
|
|
|
||
|
|
dev->dma_data[SNDRV_PCM_STREAM_CAPTURE].addr =
|
||
|
|
- dma_base + BCM2835_I2S_FIFO_A_REG;
|
||
|
|
+ res->start + BCM2835_I2S_FIFO_A_REG;
|
||
|
|
|
||
|
|
/* Set the bus width */
|
||
|
|
dev->dma_data[SNDRV_PCM_STREAM_PLAYBACK].addr_width =
|