Advertise the source and destination bus widths through the new
dma_set_{src,dst}_bus_width() helpers instead of open-coding the legacy
BIT() mask. This moves the driver onto the representation that can
express widths of 32 bytes and above while keeping the legacy u32 fields
populated during the transition.
While at it, give the channel width members their proper
enum dma_slave_buswidth type.
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Nuno Sá <nuno.sa@analog.com>
---
drivers/dma/dma-axi-dmac.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/dma/dma-axi-dmac.c b/drivers/dma/dma-axi-dmac.c
index d47ff27e1408..dc56178cafe0 100644
--- a/drivers/dma/dma-axi-dmac.c
+++ b/drivers/dma/dma-axi-dmac.c
@@ -12,6 +12,7 @@
#include <linux/clk.h>
#include <linux/device.h>
#include <linux/dma-mapping.h>
+#include <linux/dma/engine/widthmask.h>
#include <linux/dmaengine.h>
#include <linux/dmapool.h>
#include <linux/err.h>
@@ -152,8 +153,8 @@ struct axi_dmac_chan {
struct list_head active_descs;
enum dma_transfer_direction direction;
- unsigned int src_width;
- unsigned int dest_width;
+ enum dma_slave_buswidth src_width;
+ enum dma_slave_buswidth dest_width;
unsigned int src_type;
unsigned int dest_type;
@@ -1262,8 +1263,13 @@ static int axi_dmac_probe(struct platform_device *pdev)
dma_dev->device_terminate_all = axi_dmac_terminate_all;
dma_dev->device_synchronize = axi_dmac_synchronize;
dma_dev->dev = &pdev->dev;
- dma_dev->src_addr_widths = BIT(dmac->chan.src_width);
- dma_dev->dst_addr_widths = BIT(dmac->chan.dest_width);
+ ret = dma_bus_width_set(dma_dev->src_bus_widths, dmac->chan.src_width);
+ if (ret)
+ return ret;
+
+ ret = dma_bus_width_set(dma_dev->dst_bus_widths, dmac->chan.dest_width);
+ if (ret)
+ return ret;
dma_dev->directions = BIT(dmac->chan.direction);
dma_dev->residue_granularity = DMA_RESIDUE_GRANULARITY_DESCRIPTOR;
dma_dev->max_sg_burst = 31; /* 31 SGs maximum in one burst */
--
2.55.0