mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00:00
62 lines
1.8 KiB
Diff
62 lines
1.8 KiB
Diff
|
From 00ed6fec84ab10970bd8e5964312fa1cc0e78901 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
||
|
|
Date: Thu, 11 May 2023 16:25:46 +0100
|
||
|
|
Subject: [PATCH 0466/1085] mmc: bcm2835: Use phys addresses for slave DMA
|
||
|
|
config
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
drivers/mmc/host/bcm2835.c | 17 +++--------------
|
||
|
|
1 file changed, 3 insertions(+), 14 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/mmc/host/bcm2835.c
|
||
|
|
+++ b/drivers/mmc/host/bcm2835.c
|
||
|
|
@@ -38,7 +38,6 @@
|
||
|
|
#include <linux/io.h>
|
||
|
|
#include <linux/iopoll.h>
|
||
|
|
#include <linux/module.h>
|
||
|
|
-#include <linux/of_address.h>
|
||
|
|
#include <linux/of_irq.h>
|
||
|
|
#include <linux/platform_device.h>
|
||
|
|
#include <linux/scatterlist.h>
|
||
|
|
@@ -1347,8 +1346,8 @@ static int bcm2835_probe(struct platform
|
||
|
|
struct device *dev = &pdev->dev;
|
||
|
|
struct clk *clk;
|
||
|
|
struct bcm2835_host *host;
|
||
|
|
+ struct resource *iomem;
|
||
|
|
struct mmc_host *mmc;
|
||
|
|
- const __be32 *regaddr_p;
|
||
|
|
int ret;
|
||
|
|
|
||
|
|
dev_dbg(dev, "%s\n", __func__);
|
||
|
|
@@ -1361,23 +1360,13 @@ static int bcm2835_probe(struct platform
|
||
|
|
host->pdev = pdev;
|
||
|
|
spin_lock_init(&host->lock);
|
||
|
|
|
||
|
|
- host->ioaddr = devm_platform_ioremap_resource(pdev, 0);
|
||
|
|
+ host->ioaddr = devm_platform_get_and_ioremap_resource(pdev, 0, &iomem);
|
||
|
|
if (IS_ERR(host->ioaddr)) {
|
||
|
|
ret = PTR_ERR(host->ioaddr);
|
||
|
|
goto err;
|
||
|
|
}
|
||
|
|
|
||
|
|
- /* Parse OF address directly to get the physical address for
|
||
|
|
- * DMA to our registers.
|
||
|
|
- */
|
||
|
|
- regaddr_p = of_get_address(pdev->dev.of_node, 0, NULL, NULL);
|
||
|
|
- if (!regaddr_p) {
|
||
|
|
- dev_err(dev, "Can't get phys address\n");
|
||
|
|
- ret = -EINVAL;
|
||
|
|
- goto err;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- host->phys_addr = be32_to_cpup(regaddr_p);
|
||
|
|
+ host->phys_addr = iomem->start;
|
||
|
|
|
||
|
|
host->dma_chan = NULL;
|
||
|
|
host->dma_desc = NULL;
|