Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1291546

[PATCH V03 4/5] dmaengine: edma: Add support for DMA filter mapping to slave devices

Show all headers | View raw

Add support for providing device to filter_fn mapping so client drivers
can switch to use the dma_request_chan() API.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/dma/edma.c                 | 4 ++++
 include/linux/platform_data/edma.h | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index 16fe773fb846..2e8acde6b134 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -2314,6 +2314,10 @@ static int edma_probe(struct platform_device *pdev)
 		edma_set_chmap(&ecc->slave_chans[i], ecc->dummy_slot);
 	}
 
+	ecc->dma_slave.filter.map = info->slave_map;
+	ecc->dma_slave.filter.mapcnt = info->slavecnt;
+	ecc->dma_slave.filter.fn = edma_filter_fn;
+
 	ret = dma_async_device_register(&ecc->dma_slave);
 	if (ret) {
 		dev_err(dev, "slave ddev registration failed (%d)\n", ret);
diff --git a/include/linux/platform_data/edma.h b/include/linux/platform_data/edma.h
index 4299f4ba03bd..0a533f94438f 100644
--- a/include/linux/platform_data/edma.h
+++ b/include/linux/platform_data/edma.h
@@ -53,12 +53,16 @@ enum dma_event_q {
 #define EDMA_CTLR(i)			((i) >> 16)
 #define EDMA_CHAN_SLOT(i)		((i) & 0xffff)
 
+#define EDMA_FILTER_PARAM(ctlr, chan)	((int[]) { EDMA_CTLR_CHAN(ctlr, chan) })
+
 struct edma_rsv_info {
 
 	const s16	(*rsv_chans)[2];
 	const s16	(*rsv_slots)[2];
 };
 
+struct dma_slave_map;
+
 /* platform_data for EDMA driver */
 struct edma_soc_info {
 	/*
@@ -76,6 +80,9 @@ struct edma_soc_info {
 
 	s8	(*queue_priority_mapping)[2];
 	const s16	(*xbar_chans)[2];
+
+	const struct dma_slave_map *slave_map;
+	int slavecnt;
 };
 
 #endif
-- 
2.6.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH V03 0/5] dmaengine: New 'universal' API for requesting channel Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-12-14 21:50 +0100
  [PATCH V03 5/5] dmaengine: omap-dma: Add support for DMA filter mapping to slave devices Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-12-14 21:50 +0100
  [PATCH V03 3/5] dmaengine: core: Introduce new, universal API to request a channel Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-12-14 21:50 +0100
  [PATCH V03 4/5] dmaengine: edma: Add support for DMA filter mapping to slave devices Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-12-14 21:50 +0100
  [PATCH V03 1/5] dmaengine: core: Skip mask matching when it is not provided to private_candidate Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-12-14 21:50 +0100
  [PATCH V03 2/5] dmaengine: core: Move and merge the code paths using private_candidate Peter Ujfalusi <peter.ujfalusi@ti.com> - 2015-12-14 21:50 +0100
  Re: [PATCH V03 0/5] dmaengine: New 'universal' API for requesting  channel Vinod Koul <vinod.koul@intel.com> - 2015-12-18 06:50 +0100

csiph-web