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

Groups > linux.kernel > #1324047

[PATCH 4/5] ARM: davinci: dm644x: Add dma_slave_map to edma

Show all headers | View raw

Provide the dma_slave_map to edma which will allow us to move the drivers
to the new, simpler dmaengine API and we can remove the DMA resources also
for the devices.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

FIX: dm646x
---
 arch/arm/mach-davinci/dm644x.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index b28071ae3a57..5ccd8bda96aa 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/clk.h>
 #include <linux/serial_8250.h>
+#include <linux/dmaengine.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/edma.h>
 #include <linux/platform_data/gpio-davinci.h>
@@ -505,9 +506,20 @@ static s8 queue_priority_mapping[][2] = {
 	{-1, -1},
 };
 
+static const struct dma_slave_map da644x_edma_map[] = {
+	{ "davinci-mcbsp", "tx", EDMA_FILTER_PARAM(0, 2) },
+	{ "davinci-mcbsp", "rx", EDMA_FILTER_PARAM(0, 3) },
+	{ "spi_davinci", "tx", EDMA_FILTER_PARAM(0, 16) },
+	{ "spi_davinci", "rx", EDMA_FILTER_PARAM(0, 17) },
+	{ "dm6441-mmc.0", "rx", EDMA_FILTER_PARAM(0, 26) },
+	{ "dm6441-mmc.0", "tx", EDMA_FILTER_PARAM(0, 27) },
+};
+
 static struct edma_soc_info dm644x_edma_pdata = {
 	.queue_priority_mapping	= queue_priority_mapping,
 	.default_queue		= EVENTQ_1,
+	.slave_map		= da644x_edma_map,
+	.slavecnt		= ARRAY_SIZE(da644x_edma_map),
 };
 
 static struct resource edma_resources[] = {
-- 
2.7.0

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

Thread

[PATCH 0/5] ARM: davinci: Add dma_slave_map to board files Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-02-02 13:50 +0100
  [PATCH 1/5] ARM: davinci: devices-da8xx: Add dma_slave_map to edma Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-02-02 13:50 +0100
  [PATCH 4/5] ARM: davinci: dm644x: Add dma_slave_map to edma Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-02-02 13:50 +0100
  [PATCH 5/5] ARM: davinci: dm646x: Add dma_slave_map to edma Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-02-02 13:50 +0100
  [PATCH 3/5] ARM: davinci: dm365: Add dma_slave_map to edma Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-02-02 13:50 +0100

csiph-web