From 6dfb8956f57e51b1727551bb69b6a03207129a1a Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 25 May 2023 14:48:28 +0100 Subject: [PATCH 380/697] dmaengine: bcm2835: Rename to_bcm2711_cbaddr to to_40bit_cbaddr As the shifted address also applies to bcm2712, give the function a more specific name. Signed-off-by: Dom Cobley --- drivers/dma/bcm2835-dma.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -391,7 +391,7 @@ static inline uint32_t to_bcm2711_dsti(u BCM2711_DMA40_BURST_LEN(BCM2835_DMA_GET_BURST_LENGTH(info)); } -static inline uint32_t to_bcm2711_cbaddr(dma_addr_t addr) +static inline uint32_t to_40bit_cbaddr(dma_addr_t addr) { BUG_ON(addr & 0x1f); return (addr >> 5); @@ -578,10 +578,10 @@ static struct bcm2835_desc *bcm2835_dma_ if (frame && c->is_40bit_channel) ((struct bcm2711_dma40_scb *) d->cb_list[frame - 1].cb)->next_cb = - to_bcm2711_cbaddr(cb_entry->paddr); + to_40bit_cbaddr(cb_entry->paddr); if (frame && !c->is_40bit_channel) d->cb_list[frame - 1].cb->next = c->is_2712 ? - to_bcm2711_cbaddr(cb_entry->paddr) : cb_entry->paddr; + to_40bit_cbaddr(cb_entry->paddr) : cb_entry->paddr; /* update src and dst and length */ if (src && (info & BCM2835_DMA_S_INC)) { @@ -761,14 +761,14 @@ static void bcm2835_dma_start_desc(struc c->desc = d = to_bcm2835_dma_desc(&vd->tx); if (c->is_40bit_channel) { - writel(to_bcm2711_cbaddr(d->cb_list[0].paddr), + writel(to_40bit_cbaddr(d->cb_list[0].paddr), c->chan_base + BCM2711_DMA40_CB); writel(BCM2711_DMA40_ACTIVE | BCM2711_DMA40_PROT | BCM2711_DMA40_CS_FLAGS(c->dreq), c->chan_base + BCM2711_DMA40_CS); } else { writel(BIT(31), c->chan_base + BCM2835_DMA_CS); - writel(c->is_2712 ? to_bcm2711_cbaddr(d->cb_list[0].paddr) : d->cb_list[0].paddr, + writel(c->is_2712 ? to_40bit_cbaddr(d->cb_list[0].paddr) : d->cb_list[0].paddr, c->chan_base + BCM2835_DMA_ADDR); writel(BCM2835_DMA_ACTIVE | BCM2835_DMA_CS_FLAGS(c->dreq), c->chan_base + BCM2835_DMA_CS); @@ -1136,10 +1136,10 @@ static struct dma_async_tx_descriptor *b if (c->is_40bit_channel) ((struct bcm2711_dma40_scb *) d->cb_list[frames - 1].cb)->next_cb = - to_bcm2711_cbaddr(d->cb_list[0].paddr); + to_40bit_cbaddr(d->cb_list[0].paddr); else d->cb_list[d->frames - 1].cb->next = c->is_2712 ? - to_bcm2711_cbaddr(d->cb_list[0].paddr) : d->cb_list[0].paddr; + to_40bit_cbaddr(d->cb_list[0].paddr) : d->cb_list[0].paddr; return vchan_tx_prep(&c->vc, &d->vd, flags); }