]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: davinci: dm365: Add dma_slave_map to edma
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Tue, 2 Feb 2016 12:43:15 +0000 (14:43 +0200)
committerSekhar Nori <nsekhar@ti.com>
Mon, 22 Feb 2016 10:21:33 +0000 (15:51 +0530)
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>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
arch/arm/mach-davinci/dm365.c

index 01843fbcc9ea7d99be72e2fad6508b16e04e9ea7..384d3674dd9b196eafcdfec54d1481a36185ff86 100644 (file)
@@ -17,6 +17,7 @@
 #include <linux/serial_8250.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <linux/dmaengine.h>
 #include <linux/spi/spi.h>
 #include <linux/platform_data/edma.h>
 #include <linux/platform_data/gpio-davinci.h>
@@ -862,9 +863,30 @@ static s8 dm365_queue_priority_mapping[][2] = {
        {-1, -1},
 };
 
+static const struct dma_slave_map dm365_edma_map[] = {
+       { "davinci-mcbsp.0", "tx", EDMA_FILTER_PARAM(0, 2) },
+       { "davinci-mcbsp.0", "rx", EDMA_FILTER_PARAM(0, 3) },
+       { "davinci_voicecodec", "tx", EDMA_FILTER_PARAM(0, 2) },
+       { "davinci_voicecodec", "rx", EDMA_FILTER_PARAM(0, 3) },
+       { "spi_davinci.2", "tx", EDMA_FILTER_PARAM(0, 10) },
+       { "spi_davinci.2", "rx", EDMA_FILTER_PARAM(0, 11) },
+       { "spi_davinci.1", "tx", EDMA_FILTER_PARAM(0, 14) },
+       { "spi_davinci.1", "rx", EDMA_FILTER_PARAM(0, 15) },
+       { "spi_davinci.0", "tx", EDMA_FILTER_PARAM(0, 16) },
+       { "spi_davinci.0", "rx", EDMA_FILTER_PARAM(0, 17) },
+       { "spi_davinci.3", "tx", EDMA_FILTER_PARAM(0, 18) },
+       { "spi_davinci.3", "rx", EDMA_FILTER_PARAM(0, 19) },
+       { "dm6441-mmc.0", "rx", EDMA_FILTER_PARAM(0, 26) },
+       { "dm6441-mmc.0", "tx", EDMA_FILTER_PARAM(0, 27) },
+       { "dm6441-mmc.1", "rx", EDMA_FILTER_PARAM(0, 30) },
+       { "dm6441-mmc.1", "tx", EDMA_FILTER_PARAM(0, 31) },
+};
+
 static struct edma_soc_info dm365_edma_pdata = {
        .queue_priority_mapping = dm365_queue_priority_mapping,
        .default_queue          = EVENTQ_3,
+       .slave_map              = dm365_edma_map,
+       .slavecnt               = ARRAY_SIZE(dm365_edma_map),
 };
 
 static struct resource edma_resources[] = {