[PATCH 18/18] dmaengine: bcm2835: Revert the workaround for DMA addresses

Dave Stevenson
2024-05-24T18:28:05Z

Now that all DMA clients are passing in CPU addresses, drop
the workaround that would accept those and not try mapping
them.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
drivers/dma/bcm2835-dma.c | 11 -----------
1 file changed, 11 deletions(-)

diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
index 06407691ef28..181f2c291109 100644
--- a/drivers/dma/bcm2835-dma.c
+++ b/drivers/dma/bcm2835-dma.c
@@ -405,17 +405,6 @@ static int bcm2835_dma_map_slave_addr(struct dma_chan *chan,
struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
struct bcm2835_dma_chan_map *map = &c->map;

- if ((dev_addr & 0xfe000000ULL) == 0x7e000000ULL) {
- /*
- * Address is already in the 0x7e... peripherals range.
- * Assume this is an old client that hasn't been updated to
- * correctly pass a cpu phys_addr to the DMA subsystem.
- */
- map->addr = dev_addr;
-
- return 0;
- }
-
if (dev_size != DMA_SLAVE_BUSWIDTH_4_BYTES)
return -EIO;

--
2.34.1