mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-06 01:49:46 +00:00
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>
This commit is contained in:
@@ -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>
|
||||
@@ -1367,8 +1366,8 @@ static int bcm2835_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
struct bcm2835_host *host;
|
||||
struct resource *iomem;
|
||||
struct mmc_host *mmc;
|
||||
const __be32 *regaddr_p;
|
||||
int ret;
|
||||
|
||||
dev_dbg(dev, "%s\n", __func__);
|
||||
@@ -1381,23 +1380,13 @@ static int bcm2835_probe(struct platform_device *pdev)
|
||||
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;
|
||||
|
||||
Reference in New Issue
Block a user