aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2014-11-17 08:42:47 -0500
committerVinod Koul <vinod.koul@intel.com>2014-12-22 02:03:23 -0500
commit9f59cd0519c3b68bae7d9bef65d32722ce653a93 (patch)
tree770aa77ed94c803744325b0c4a3d2d9eec91f9f1
parentf45c431148e1ba0d7b2b9f9d106ec7aab6d00830 (diff)
dmaengine: edma: Declare slave capabilities for the generic code
Now that the generic slave caps code can make use of the device assigned capabilities, instead of relying on a callback to be implemented. Make use of this code. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r--drivers/dma/edma.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index 8feb096786f8..e95fa7dabc0c 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -971,19 +971,6 @@ static void __init edma_chan_init(struct edma_cc *ecc,
971 BIT(DMA_SLAVE_BUSWIDTH_3_BYTES) | \ 971 BIT(DMA_SLAVE_BUSWIDTH_3_BYTES) | \
972 BIT(DMA_SLAVE_BUSWIDTH_4_BYTES)) 972 BIT(DMA_SLAVE_BUSWIDTH_4_BYTES))
973 973
974static int edma_dma_device_slave_caps(struct dma_chan *dchan,
975 struct dma_slave_caps *caps)
976{
977 caps->src_addr_widths = EDMA_DMA_BUSWIDTHS;
978 caps->dst_addr_widths = EDMA_DMA_BUSWIDTHS;
979 caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
980 caps->cmd_pause = true;
981 caps->cmd_terminate = true;
982 caps->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
983
984 return 0;
985}
986
987static void edma_dma_init(struct edma_cc *ecc, struct dma_device *dma, 974static void edma_dma_init(struct edma_cc *ecc, struct dma_device *dma,
988 struct device *dev) 975 struct device *dev)
989{ 976{
@@ -998,7 +985,12 @@ static void edma_dma_init(struct edma_cc *ecc, struct dma_device *dma,
998 dma->device_pause = edma_dma_pause; 985 dma->device_pause = edma_dma_pause;
999 dma->device_resume = edma_dma_resume; 986 dma->device_resume = edma_dma_resume;
1000 dma->device_terminate_all = edma_terminate_all; 987 dma->device_terminate_all = edma_terminate_all;
1001 dma->device_slave_caps = edma_dma_device_slave_caps; 988
989 dma->src_addr_widths = EDMA_DMA_BUSWIDTHS;
990 dma->dst_addr_widths = EDMA_DMA_BUSWIDTHS;
991 dma->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
992 dma->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
993
1002 dma->dev = dev; 994 dma->dev = dev;
1003 995
1004 /* 996 /*