DMAENGINE: ste_dma40: add DB8500 memcpy channels

This adds all available memcpy channels to the DB8500 in the
ux500 platform (and fixes a typo).

Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index 8d94bc673aa44b7e0c37e5dda4a9d9a142706589..a001e4c052c2d3e346998137699908c629f854db 100644 (file)
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -177,10 +177,12 @@ static const dma_addr_t dma40_rx_map[STEDMA40_NR_DEV];
 
 /* Reserved event lines for memcpy only */
 static int dma40_memcpy_event[] = {
+       STEDMA40_MEMCPY_TX_0,
        STEDMA40_MEMCPY_TX_1,
        STEDMA40_MEMCPY_TX_2,
        STEDMA40_MEMCPY_TX_3,
        STEDMA40_MEMCPY_TX_4,
+       STEDMA40_MEMCPY_TX_5,
 };
 
 static struct stedma40_platform_data dma40_plat_data = {

diff --git a/arch/arm/mach-ux500/ste-dma40-db8500.h b/arch/arm/mach-ux500/ste-dma40-db8500.h
index e7016278dfa99f13c2579484cc83280e0bd382f2..9d9d3797b3b05a5cae83affcfe7817912b7bf651 100644 (file)
--- a/arch/arm/mach-ux500/ste-dma40-db8500.h
+++ b/arch/arm/mach-ux500/ste-dma40-db8500.h
@@ -136,7 +136,7 @@ enum dma_dest_dev_type {
        STEDMA40_DEV_CAC1_TX = 48,
        STEDMA40_DEV_CAC1_TX_HAC1_TX = 49,
        STEDMA40_DEV_HAC1_TX = 50,
-       STEDMA40_MEMXCPY_TX_0 = 51,
+       STEDMA40_MEMCPY_TX_0 = 51,
        STEDMA40_DEV_SLIM1_CH0_TX_HSI_TX_CH4 = 52,
        STEDMA40_DEV_SLIM1_CH1_TX_HSI_TX_CH5 = 53,
        STEDMA40_DEV_SLIM1_CH2_TX_HSI_TX_CH6 = 54,