* [PATCH 0/5] ARM: davinci: Add dma_slave_map to board files
@ 2016-02-02 12:43 ` Peter Ujfalusi
0 siblings, 0 replies; 22+ messages in thread
From: Peter Ujfalusi @ 2016-02-02 12:43 UTC (permalink / raw)
To: nsekhar; +Cc: linux-arm-kernel, linux-kernel, khilman, arnd
Hi,
The following series adds the dma_slave map to the edma driver. The
dma_slave_map is needed later when we convert drivers to use the new dmaengine
API for requesting slave channels.
Regards,
Peter
---
Peter Ujfalusi (5):
ARM: davinci: devices-da8xx: Add dma_slave_map to edma
ARM: davinci: dm355: Add dma_slave_map to edma
ARM: davinci: dm365: Add dma_slave_map to edma
ARM: davinci: dm644x: Add dma_slave_map to edma
ARM: davinci: dm646x: Add dma_slave_map to edma
arch/arm/mach-davinci/devices-da8xx.c | 46 +++++++++++++++++++++++++++++++++++
arch/arm/mach-davinci/dm355.c | 20 +++++++++++++++
arch/arm/mach-davinci/dm365.c | 22 +++++++++++++++++
arch/arm/mach-davinci/dm644x.c | 12 +++++++++
arch/arm/mach-davinci/dm646x.c | 11 +++++++++
5 files changed, 111 insertions(+)
--
2.7.0
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 1/5] ARM: davinci: devices-da8xx: Add dma_slave_map to edma
2016-02-02 12:43 ` Peter Ujfalusi
@ 2016-02-02 12:43 ` Peter Ujfalusi
-1 siblings, 0 replies; 22+ messages in thread
From: Peter Ujfalusi @ 2016-02-02 12:43 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
arch/arm/mach-davinci/devices-da8xx.c | 46 +++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index e88b7a5cde99..07b8c97466d1 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -17,6 +17,7 @@
#include <linux/ahci_platform.h>
#include <linux/clk.h>
#include <linux/reboot.h>
+#include <linux/dmaengine.h>
#include <mach/cputype.h>
#include <mach/common.h>
@@ -233,16 +234,54 @@ static const struct platform_device_info da850_edma1_device __initconst = {
.size_data = sizeof(da850_edma1_pdata),
};
+static const struct dma_slave_map da830_edma_map[] = {
+ { "davinci-mcasp.0", "rx", EDMA_FILTER_PARAM(0, 0) },
+ { "davinci-mcasp.0", "tx", EDMA_FILTER_PARAM(0, 1) },
+ { "davinci-mcasp.1", "rx", EDMA_FILTER_PARAM(0, 2) },
+ { "davinci-mcasp.1", "tx", EDMA_FILTER_PARAM(0, 3) },
+ { "davinci-mcasp.2", "rx", EDMA_FILTER_PARAM(0, 4) },
+ { "davinci-mcasp.2", "tx", EDMA_FILTER_PARAM(0, 5) },
+ { "spi_davinci.0", "rx", EDMA_FILTER_PARAM(0, 14) },
+ { "spi_davinci.0", "tx", EDMA_FILTER_PARAM(0, 15) },
+ { "da830-mmc.0", "rx", EDMA_FILTER_PARAM(0, 16) },
+ { "da830-mmc.0", "tx", EDMA_FILTER_PARAM(0, 17) },
+ { "spi_davinci.1", "rx", EDMA_FILTER_PARAM(0, 18) },
+ { "spi_davinci.1", "tx", EDMA_FILTER_PARAM(0, 19) },
+};
+
int __init da830_register_edma(struct edma_rsv_info *rsv)
{
struct platform_device *edma_pdev;
da8xx_edma0_pdata.rsv = rsv;
+ da8xx_edma0_pdata.slave_map = da830_edma_map;
+ da8xx_edma0_pdata.slavecnt = ARRAY_SIZE(da830_edma_map);
+
edma_pdev = platform_device_register_full(&da8xx_edma0_device);
return IS_ERR(edma_pdev) ? PTR_ERR(edma_pdev) : 0;
}
+static const struct dma_slave_map da850_edma0_map[] = {
+ { "davinci-mcasp.0", "rx", EDMA_FILTER_PARAM(0, 0) },
+ { "davinci-mcasp.0", "tx", EDMA_FILTER_PARAM(0, 1) },
+ { "davinci-mcbsp.0", "rx", EDMA_FILTER_PARAM(0, 2) },
+ { "davinci-mcbsp.0", "tx", EDMA_FILTER_PARAM(0, 3) },
+ { "davinci-mcbsp.1", "rx", EDMA_FILTER_PARAM(0, 4) },
+ { "davinci-mcbsp.1", "tx", EDMA_FILTER_PARAM(0, 5) },
+ { "spi_davinci.0", "rx", EDMA_FILTER_PARAM(0, 14) },
+ { "spi_davinci.0", "tx", EDMA_FILTER_PARAM(0, 15) },
+ { "da830-mmc.0", "rx", EDMA_FILTER_PARAM(0, 16) },
+ { "da830-mmc.0", "tx", EDMA_FILTER_PARAM(0, 17) },
+ { "spi_davinci.1", "rx", EDMA_FILTER_PARAM(0, 18) },
+ { "spi_davinci.1", "tx", EDMA_FILTER_PARAM(0, 19) },
+};
+
+static const struct dma_slave_map da850_edma1_map[] = {
+ { "da830-mmc.1", "rx", EDMA_FILTER_PARAM(0, 28) },
+ { "da830-mmc.1", "tx", EDMA_FILTER_PARAM(0, 29) },
+};
+
int __init da850_register_edma(struct edma_rsv_info *rsv[2])
{
struct platform_device *edma_pdev;
@@ -252,11 +291,18 @@ int __init da850_register_edma(struct edma_rsv_info *rsv[2])
da850_edma1_pdata.rsv = rsv[1];
}
+ da8xx_edma0_pdata.slave_map = da850_edma0_map;
+ da8xx_edma0_pdata.slavecnt = ARRAY_SIZE(da850_edma0_map);
+
edma_pdev = platform_device_register_full(&da8xx_edma0_device);
if (IS_ERR(edma_pdev)) {
pr_warn("%s: Failed to register eDMA0\n", __func__);
return PTR_ERR(edma_pdev);
}
+
+ da850_edma1_pdata.slave_map = da850_edma1_map;
+ da850_edma1_pdata.slavecnt = ARRAY_SIZE(da850_edma1_map);
+
edma_pdev = platform_device_register_full(&da850_edma1_device);
return IS_ERR(edma_pdev) ? PTR_ERR(edma_pdev) : 0;
}
--
2.7.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 1/5] ARM: davinci: devices-da8xx: Add dma_slave_map to edma
@ 2016-02-02 12:43 ` Peter Ujfalusi
0 siblings, 0 replies; 22+ messages in thread
From: Peter Ujfalusi @ 2016-02-02 12:43 UTC (permalink / raw)
To: nsekhar; +Cc: linux-arm-kernel, linux-kernel, khilman, arnd
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>
---
arch/arm/mach-davinci/devices-da8xx.c | 46 +++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index e88b7a5cde99..07b8c97466d1 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -17,6 +17,7 @@
#include <linux/ahci_platform.h>
#include <linux/clk.h>
#include <linux/reboot.h>
+#include <linux/dmaengine.h>
#include <mach/cputype.h>
#include <mach/common.h>
@@ -233,16 +234,54 @@ static const struct platform_device_info da850_edma1_device __initconst = {
.size_data = sizeof(da850_edma1_pdata),
};
+static const struct dma_slave_map da830_edma_map[] = {
+ { "davinci-mcasp.0", "rx", EDMA_FILTER_PARAM(0, 0) },
+ { "davinci-mcasp.0", "tx", EDMA_FILTER_PARAM(0, 1) },
+ { "davinci-mcasp.1", "rx", EDMA_FILTER_PARAM(0, 2) },
+ { "davinci-mcasp.1", "tx", EDMA_FILTER_PARAM(0, 3) },
+ { "davinci-mcasp.2", "rx", EDMA_FILTER_PARAM(0, 4) },
+ { "davinci-mcasp.2", "tx", EDMA_FILTER_PARAM(0, 5) },
+ { "spi_davinci.0", "rx", EDMA_FILTER_PARAM(0, 14) },
+ { "spi_davinci.0", "tx", EDMA_FILTER_PARAM(0, 15) },
+ { "da830-mmc.0", "rx", EDMA_FILTER_PARAM(0, 16) },
+ { "da830-mmc.0", "tx", EDMA_FILTER_PARAM(0, 17) },
+ { "spi_davinci.1", "rx", EDMA_FILTER_PARAM(0, 18) },
+ { "spi_davinci.1", "tx", EDMA_FILTER_PARAM(0, 19) },
+};
+
int __init da830_register_edma(struct edma_rsv_info *rsv)
{
struct platform_device *edma_pdev;
da8xx_edma0_pdata.rsv = rsv;
+ da8xx_edma0_pdata.slave_map = da830_edma_map;
+ da8xx_edma0_pdata.slavecnt = ARRAY_SIZE(da830_edma_map);
+
edma_pdev = platform_device_register_full(&da8xx_edma0_device);
return IS_ERR(edma_pdev) ? PTR_ERR(edma_pdev) : 0;
}
+static const struct dma_slave_map da850_edma0_map[] = {
+ { "davinci-mcasp.0", "rx", EDMA_FILTER_PARAM(0, 0) },
+ { "davinci-mcasp.0", "tx", EDMA_FILTER_PARAM(0, 1) },
+ { "davinci-mcbsp.0", "rx", EDMA_FILTER_PARAM(0, 2) },
+ { "davinci-mcbsp.0", "tx", EDMA_FILTER_PARAM(0, 3) },
+ { "davinci-mcbsp.1", "rx", EDMA_FILTER_PARAM(0, 4) },
+ { "davinci-mcbsp.1", "tx", EDMA_FILTER_PARAM(0, 5) },
+ { "spi_davinci.0", "rx", EDMA_FILTER_PARAM(0, 14) },
+ { "spi_davinci.0", "tx", EDMA_FILTER_PARAM(0, 15) },
+ { "da830-mmc.0", "rx", EDMA_FILTER_PARAM(0, 16) },
+ { "da830-mmc.0", "tx", EDMA_FILTER_PARAM(0, 17) },
+ { "spi_davinci.1", "rx", EDMA_FILTER_PARAM(0, 18) },
+ { "spi_davinci.1", "tx", EDMA_FILTER_PARAM(0, 19) },
+};
+
+static const struct dma_slave_map da850_edma1_map[] = {
+ { "da830-mmc.1", "rx", EDMA_FILTER_PARAM(0, 28) },
+ { "da830-mmc.1", "tx", EDMA_FILTER_PARAM(0, 29) },
+};
+
int __init da850_register_edma(struct edma_rsv_info *rsv[2])
{
struct platform_device *edma_pdev;
@@ -252,11 +291,18 @@ int __init da850_register_edma(struct edma_rsv_info *rsv[2])
da850_edma1_pdata.rsv = rsv[1];
}
+ da8xx_edma0_pdata.slave_map = da850_edma0_map;
+ da8xx_edma0_pdata.slavecnt = ARRAY_SIZE(da850_edma0_map);
+
edma_pdev = platform_device_register_full(&da8xx_edma0_device);
if (IS_ERR(edma_pdev)) {
pr_warn("%s: Failed to register eDMA0\n", __func__);
return PTR_ERR(edma_pdev);
}
+
+ da850_edma1_pdata.slave_map = da850_edma1_map;
+ da850_edma1_pdata.slavecnt = ARRAY_SIZE(da850_edma1_map);
+
edma_pdev = platform_device_register_full(&da850_edma1_device);
return IS_ERR(edma_pdev) ? PTR_ERR(edma_pdev) : 0;
}
--
2.7.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 1/5] ARM: davinci: devices-da8xx: Add dma_slave_map to edma
2016-02-02 12:43 ` Peter Ujfalusi
@ 2016-02-22 9:36 ` Sekhar Nori
-1 siblings, 0 replies; 22+ messages in thread
From: Sekhar Nori @ 2016-02-22 9:36 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 02 February 2016 06:13 PM, Peter Ujfalusi wrote:
> +static const struct dma_slave_map da850_edma1_map[] = {
> + { "da830-mmc.1", "rx", EDMA_FILTER_PARAM(0, 28) },
> + { "da830-mmc.1", "tx", EDMA_FILTER_PARAM(0, 29) },
This should be EDMA_FILTER_PARAM(1, 29) (and similar for rx). No need to
resend though, I will fix while applying.
Regards,
Sekhar
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 1/5] ARM: davinci: devices-da8xx: Add dma_slave_map to edma
@ 2016-02-22 9:36 ` Sekhar Nori
0 siblings, 0 replies; 22+ messages in thread
From: Sekhar Nori @ 2016-02-22 9:36 UTC (permalink / raw)
To: Peter Ujfalusi; +Cc: linux-arm-kernel, linux-kernel, khilman, arnd
On Tuesday 02 February 2016 06:13 PM, Peter Ujfalusi wrote:
> +static const struct dma_slave_map da850_edma1_map[] = {
> + { "da830-mmc.1", "rx", EDMA_FILTER_PARAM(0, 28) },
> + { "da830-mmc.1", "tx", EDMA_FILTER_PARAM(0, 29) },
This should be EDMA_FILTER_PARAM(1, 29) (and similar for rx). No need to
resend though, I will fix while applying.
Regards,
Sekhar
^ permalink raw reply [flat|nested] 22+ messages in thread* [PATCH 1/5] ARM: davinci: devices-da8xx: Add dma_slave_map to edma
2016-02-22 9:36 ` Sekhar Nori
@ 2016-02-25 9:40 ` Peter Ujfalusi
-1 siblings, 0 replies; 22+ messages in thread
From: Peter Ujfalusi @ 2016-02-25 9:40 UTC (permalink / raw)
To: linux-arm-kernel
On 02/22/2016 11:36 AM, Sekhar Nori wrote:
> On Tuesday 02 February 2016 06:13 PM, Peter Ujfalusi wrote:
>
>> +static const struct dma_slave_map da850_edma1_map[] = {
>> + { "da830-mmc.1", "rx", EDMA_FILTER_PARAM(0, 28) },
>> + { "da830-mmc.1", "tx", EDMA_FILTER_PARAM(0, 29) },
>
> This should be EDMA_FILTER_PARAM(1, 29) (and similar for rx). No need to
> resend though, I will fix while applying.
True and thank you for fixing it up!
>
> Regards,
> Sekhar
>
--
P?ter
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 1/5] ARM: davinci: devices-da8xx: Add dma_slave_map to edma
@ 2016-02-25 9:40 ` Peter Ujfalusi
0 siblings, 0 replies; 22+ messages in thread
From: Peter Ujfalusi @ 2016-02-25 9:40 UTC (permalink / raw)
To: Sekhar Nori; +Cc: linux-arm-kernel, linux-kernel, khilman, arnd
On 02/22/2016 11:36 AM, Sekhar Nori wrote:
> On Tuesday 02 February 2016 06:13 PM, Peter Ujfalusi wrote:
>
>> +static const struct dma_slave_map da850_edma1_map[] = {
>> + { "da830-mmc.1", "rx", EDMA_FILTER_PARAM(0, 28) },
>> + { "da830-mmc.1", "tx", EDMA_FILTER_PARAM(0, 29) },
>
> This should be EDMA_FILTER_PARAM(1, 29) (and similar for rx). No need to
> resend though, I will fix while applying.
True and thank you for fixing it up!
>
> Regards,
> Sekhar
>
--
Péter
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 2/5] ARM: davinci: dm355: Add dma_slave_map to edma
2016-02-02 12:43 ` Peter Ujfalusi
@ 2016-02-02 12:43 ` Peter Ujfalusi
-1 siblings, 0 replies; 22+ messages in thread
From: Peter Ujfalusi @ 2016-02-02 12:43 UTC (permalink / raw)
To: linux-arm-kernel
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: dm355
---
arch/arm/mach-davinci/dm355.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index c7c1458df23c..092ca1e30e98 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -13,6 +13,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>
@@ -576,9 +577,28 @@ static s8 queue_priority_mapping[][2] = {
{-1, -1},
};
+static const struct dma_slave_map da355_edma_map[] = {
+ { "davinci-mcbsp.0", "tx", EDMA_FILTER_PARAM(0, 2) },
+ { "davinci-mcbsp.0", "rx", EDMA_FILTER_PARAM(0, 3) },
+ { "davinci-mcbsp.1", "tx", EDMA_FILTER_PARAM(0, 8) },
+ { "davinci-mcbsp.1", "rx", EDMA_FILTER_PARAM(0, 9) },
+ { "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) },
+ { "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 dm355_edma_pdata = {
.queue_priority_mapping = queue_priority_mapping,
.default_queue = EVENTQ_1,
+ .slave_map = da355_edma_map,
+ .slavecnt = ARRAY_SIZE(da355_edma_map),
};
static struct resource edma_resources[] = {
--
2.7.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 2/5] ARM: davinci: dm355: Add dma_slave_map to edma
@ 2016-02-02 12:43 ` Peter Ujfalusi
0 siblings, 0 replies; 22+ messages in thread
From: Peter Ujfalusi @ 2016-02-02 12:43 UTC (permalink / raw)
To: nsekhar; +Cc: linux-arm-kernel, linux-kernel, khilman, arnd
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: dm355
---
arch/arm/mach-davinci/dm355.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index c7c1458df23c..092ca1e30e98 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -13,6 +13,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>
@@ -576,9 +577,28 @@ static s8 queue_priority_mapping[][2] = {
{-1, -1},
};
+static const struct dma_slave_map da355_edma_map[] = {
+ { "davinci-mcbsp.0", "tx", EDMA_FILTER_PARAM(0, 2) },
+ { "davinci-mcbsp.0", "rx", EDMA_FILTER_PARAM(0, 3) },
+ { "davinci-mcbsp.1", "tx", EDMA_FILTER_PARAM(0, 8) },
+ { "davinci-mcbsp.1", "rx", EDMA_FILTER_PARAM(0, 9) },
+ { "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) },
+ { "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 dm355_edma_pdata = {
.queue_priority_mapping = queue_priority_mapping,
.default_queue = EVENTQ_1,
+ .slave_map = da355_edma_map,
+ .slavecnt = ARRAY_SIZE(da355_edma_map),
};
static struct resource edma_resources[] = {
--
2.7.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 3/5] ARM: davinci: dm365: Add dma_slave_map to edma
2016-02-02 12:43 ` Peter Ujfalusi
@ 2016-02-02 12:43 ` Peter Ujfalusi
-1 siblings, 0 replies; 22+ messages in thread
From: Peter Ujfalusi @ 2016-02-02 12:43 UTC (permalink / raw)
To: linux-arm-kernel
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: dm365
---
arch/arm/mach-davinci/dm365.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 01843fbcc9ea..d26dc2b4339a 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -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 da365_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 = da365_edma_map,
+ .slavecnt = ARRAY_SIZE(da365_edma_map),
};
static struct resource edma_resources[] = {
--
2.7.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 3/5] ARM: davinci: dm365: Add dma_slave_map to edma
@ 2016-02-02 12:43 ` Peter Ujfalusi
0 siblings, 0 replies; 22+ messages in thread
From: Peter Ujfalusi @ 2016-02-02 12:43 UTC (permalink / raw)
To: nsekhar; +Cc: linux-arm-kernel, linux-kernel, khilman, arnd
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: dm365
---
arch/arm/mach-davinci/dm365.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 01843fbcc9ea..d26dc2b4339a 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -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 da365_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 = da365_edma_map,
+ .slavecnt = ARRAY_SIZE(da365_edma_map),
};
static struct resource edma_resources[] = {
--
2.7.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 3/5] ARM: davinci: dm365: Add dma_slave_map to edma
2016-02-02 12:43 ` Peter Ujfalusi
@ 2016-02-22 9:58 ` Sekhar Nori
-1 siblings, 0 replies; 22+ messages in thread
From: Sekhar Nori @ 2016-02-22 9:58 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 02 February 2016 06:13 PM, Peter Ujfalusi wrote:
> 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: dm365
dropped this "note to self" :)
> ---
> arch/arm/mach-davinci/dm365.c | 22 ++++++++++++++++++++++
> 1 file changed, 22 insertions(+)
>
> diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
> index 01843fbcc9ea..d26dc2b4339a 100644
> --- a/arch/arm/mach-davinci/dm365.c
> +++ b/arch/arm/mach-davinci/dm365.c
> @@ -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 da365_edma_map[] = {
This should be "dm365_edma_map".
Fixed both locally while applying.
Regards,
Sekhar
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 3/5] ARM: davinci: dm365: Add dma_slave_map to edma
@ 2016-02-22 9:58 ` Sekhar Nori
0 siblings, 0 replies; 22+ messages in thread
From: Sekhar Nori @ 2016-02-22 9:58 UTC (permalink / raw)
To: Peter Ujfalusi; +Cc: linux-arm-kernel, linux-kernel, khilman, arnd
On Tuesday 02 February 2016 06:13 PM, Peter Ujfalusi wrote:
> 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: dm365
dropped this "note to self" :)
> ---
> arch/arm/mach-davinci/dm365.c | 22 ++++++++++++++++++++++
> 1 file changed, 22 insertions(+)
>
> diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
> index 01843fbcc9ea..d26dc2b4339a 100644
> --- a/arch/arm/mach-davinci/dm365.c
> +++ b/arch/arm/mach-davinci/dm365.c
> @@ -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 da365_edma_map[] = {
This should be "dm365_edma_map".
Fixed both locally while applying.
Regards,
Sekhar
^ permalink raw reply [flat|nested] 22+ messages in thread* [PATCH 3/5] ARM: davinci: dm365: Add dma_slave_map to edma
2016-02-22 9:58 ` Sekhar Nori
@ 2016-02-22 10:07 ` Sekhar Nori
-1 siblings, 0 replies; 22+ messages in thread
From: Sekhar Nori @ 2016-02-22 10:07 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 22 February 2016 03:28 PM, Sekhar Nori wrote:
> On Tuesday 02 February 2016 06:13 PM, Peter Ujfalusi wrote:
>> 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: dm365
>
> dropped this "note to self" :)
>
>> ---
>> arch/arm/mach-davinci/dm365.c | 22 ++++++++++++++++++++++
>> 1 file changed, 22 insertions(+)
>>
>> diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
>> index 01843fbcc9ea..d26dc2b4339a 100644
>> --- a/arch/arm/mach-davinci/dm365.c
>> +++ b/arch/arm/mach-davinci/dm365.c
>> @@ -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 da365_edma_map[] = {
>
> This should be "dm365_edma_map".
>
> Fixed both locally while applying.
Similar fixes needed on patches 2,4,5 as well. Made those too.
Thanks,
Sekhar
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 3/5] ARM: davinci: dm365: Add dma_slave_map to edma
@ 2016-02-22 10:07 ` Sekhar Nori
0 siblings, 0 replies; 22+ messages in thread
From: Sekhar Nori @ 2016-02-22 10:07 UTC (permalink / raw)
To: Peter Ujfalusi; +Cc: linux-arm-kernel, linux-kernel, khilman, arnd
On Monday 22 February 2016 03:28 PM, Sekhar Nori wrote:
> On Tuesday 02 February 2016 06:13 PM, Peter Ujfalusi wrote:
>> 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: dm365
>
> dropped this "note to self" :)
>
>> ---
>> arch/arm/mach-davinci/dm365.c | 22 ++++++++++++++++++++++
>> 1 file changed, 22 insertions(+)
>>
>> diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
>> index 01843fbcc9ea..d26dc2b4339a 100644
>> --- a/arch/arm/mach-davinci/dm365.c
>> +++ b/arch/arm/mach-davinci/dm365.c
>> @@ -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 da365_edma_map[] = {
>
> This should be "dm365_edma_map".
>
> Fixed both locally while applying.
Similar fixes needed on patches 2,4,5 as well. Made those too.
Thanks,
Sekhar
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 3/5] ARM: davinci: dm365: Add dma_slave_map to edma
2016-02-22 9:58 ` Sekhar Nori
@ 2016-02-25 9:39 ` Peter Ujfalusi
-1 siblings, 0 replies; 22+ messages in thread
From: Peter Ujfalusi @ 2016-02-25 9:39 UTC (permalink / raw)
To: linux-arm-kernel
On 02/22/2016 11:58 AM, Sekhar Nori wrote:
> On Tuesday 02 February 2016 06:13 PM, Peter Ujfalusi wrote:
>> 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: dm365
>
> dropped this "note to self" :)
Oh, yes, thanks. I needed to fix up things while addressing the core support
comments and the struct changed on the way several times.
Sorry about it.
>
>> ---
>> arch/arm/mach-davinci/dm365.c | 22 ++++++++++++++++++++++
>> 1 file changed, 22 insertions(+)
>>
>> diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
>> index 01843fbcc9ea..d26dc2b4339a 100644
>> --- a/arch/arm/mach-davinci/dm365.c
>> +++ b/arch/arm/mach-davinci/dm365.c
>> @@ -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 da365_edma_map[] = {
>
> This should be "dm365_edma_map".
>
> Fixed both locally while applying.
>
> Regards,
> Sekhar
>
--
P?ter
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 3/5] ARM: davinci: dm365: Add dma_slave_map to edma
@ 2016-02-25 9:39 ` Peter Ujfalusi
0 siblings, 0 replies; 22+ messages in thread
From: Peter Ujfalusi @ 2016-02-25 9:39 UTC (permalink / raw)
To: Sekhar Nori; +Cc: linux-arm-kernel, linux-kernel, khilman, arnd
On 02/22/2016 11:58 AM, Sekhar Nori wrote:
> On Tuesday 02 February 2016 06:13 PM, Peter Ujfalusi wrote:
>> 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: dm365
>
> dropped this "note to self" :)
Oh, yes, thanks. I needed to fix up things while addressing the core support
comments and the struct changed on the way several times.
Sorry about it.
>
>> ---
>> arch/arm/mach-davinci/dm365.c | 22 ++++++++++++++++++++++
>> 1 file changed, 22 insertions(+)
>>
>> diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
>> index 01843fbcc9ea..d26dc2b4339a 100644
>> --- a/arch/arm/mach-davinci/dm365.c
>> +++ b/arch/arm/mach-davinci/dm365.c
>> @@ -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 da365_edma_map[] = {
>
> This should be "dm365_edma_map".
>
> Fixed both locally while applying.
>
> Regards,
> Sekhar
>
--
Péter
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 4/5] ARM: davinci: dm644x: Add dma_slave_map to edma
2016-02-02 12:43 ` Peter Ujfalusi
@ 2016-02-02 12:43 ` Peter Ujfalusi
-1 siblings, 0 replies; 22+ messages in thread
From: Peter Ujfalusi @ 2016-02-02 12:43 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 4/5] ARM: davinci: dm644x: Add dma_slave_map to edma
@ 2016-02-02 12:43 ` Peter Ujfalusi
0 siblings, 0 replies; 22+ messages in thread
From: Peter Ujfalusi @ 2016-02-02 12:43 UTC (permalink / raw)
To: nsekhar; +Cc: linux-arm-kernel, linux-kernel, khilman, arnd
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
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 5/5] ARM: davinci: dm646x: Add dma_slave_map to edma
2016-02-02 12:43 ` Peter Ujfalusi
@ 2016-02-02 12:43 ` Peter Ujfalusi
-1 siblings, 0 replies; 22+ messages in thread
From: Peter Ujfalusi @ 2016-02-02 12:43 UTC (permalink / raw)
To: linux-arm-kernel
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/dm646x.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index cf80786e2471..93395f28caaa 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -9,6 +9,7 @@
* or implied.
*/
#include <linux/dma-mapping.h>
+#include <linux/dmaengine.h>
#include <linux/init.h>
#include <linux/clk.h>
#include <linux/serial_8250.h>
@@ -540,9 +541,19 @@ static s8 dm646x_queue_priority_mapping[][2] = {
{-1, -1},
};
+static const struct dma_slave_map da646x_edma_map[] = {
+ { "davinci-mcasp.0", "tx", EDMA_FILTER_PARAM(0, 6) },
+ { "davinci-mcasp.0", "rx", EDMA_FILTER_PARAM(0, 9) },
+ { "davinci-mcasp.1", "tx", EDMA_FILTER_PARAM(0, 12) },
+ { "spi_davinci", "tx", EDMA_FILTER_PARAM(0, 16) },
+ { "spi_davinci", "rx", EDMA_FILTER_PARAM(0, 17) },
+};
+
static struct edma_soc_info dm646x_edma_pdata = {
.queue_priority_mapping = dm646x_queue_priority_mapping,
.default_queue = EVENTQ_1,
+ .slave_map = da646x_edma_map,
+ .slavecnt = ARRAY_SIZE(da646x_edma_map),
};
static struct resource edma_resources[] = {
--
2.7.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 5/5] ARM: davinci: dm646x: Add dma_slave_map to edma
@ 2016-02-02 12:43 ` Peter Ujfalusi
0 siblings, 0 replies; 22+ messages in thread
From: Peter Ujfalusi @ 2016-02-02 12:43 UTC (permalink / raw)
To: nsekhar; +Cc: linux-arm-kernel, linux-kernel, khilman, arnd
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/dm646x.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index cf80786e2471..93395f28caaa 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -9,6 +9,7 @@
* or implied.
*/
#include <linux/dma-mapping.h>
+#include <linux/dmaengine.h>
#include <linux/init.h>
#include <linux/clk.h>
#include <linux/serial_8250.h>
@@ -540,9 +541,19 @@ static s8 dm646x_queue_priority_mapping[][2] = {
{-1, -1},
};
+static const struct dma_slave_map da646x_edma_map[] = {
+ { "davinci-mcasp.0", "tx", EDMA_FILTER_PARAM(0, 6) },
+ { "davinci-mcasp.0", "rx", EDMA_FILTER_PARAM(0, 9) },
+ { "davinci-mcasp.1", "tx", EDMA_FILTER_PARAM(0, 12) },
+ { "spi_davinci", "tx", EDMA_FILTER_PARAM(0, 16) },
+ { "spi_davinci", "rx", EDMA_FILTER_PARAM(0, 17) },
+};
+
static struct edma_soc_info dm646x_edma_pdata = {
.queue_priority_mapping = dm646x_queue_priority_mapping,
.default_queue = EVENTQ_1,
+ .slave_map = da646x_edma_map,
+ .slavecnt = ARRAY_SIZE(da646x_edma_map),
};
static struct resource edma_resources[] = {
--
2.7.0
^ permalink raw reply related [flat|nested] 22+ messages in thread