aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-05-03 21:46:09 +0200
committerLinus Walleij <linus.walleij@linaro.org>2013-05-23 21:10:48 +0200
commita2acaa2163566ad2e04b10fdf81de650e9b9261b (patch)
treeafe1062558dc66655bad274679b2ae484c087263 /drivers/dma
parentdmaengine: ste_dma40: Assign memcpy channels in the driver (diff)
downloadlinux-dev-a2acaa2163566ad2e04b10fdf81de650e9b9261b.tar.xz
linux-dev-a2acaa2163566ad2e04b10fdf81de650e9b9261b.zip
dmaengine: ste_dma40: Fix up static memcpy event lines
The commit "dmaengine: ste_dma40: Assign memcpy channels in the driver" had two problems: - It assigned magic numbers to the memcpy event lines instead of giving them symbolic names. - It seems to have missed one of the memcpy event lines, number 51. This patch fixes it up. Acked-by: Lee Jones <lee.jones@linaro.org> Acked-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/ste_dma40.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 12de79e84b15..cd7b4808d08c 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -56,7 +56,21 @@
#define MAX(a, b) (((a) < (b)) ? (b) : (a))
/* Reserved event lines for memcpy only. */
-static int dma40_memcpy_channels[] = { 56, 57, 58, 59, 60 };
+#define DB8500_DMA_MEMCPY_EV_0 51
+#define DB8500_DMA_MEMCPY_EV_1 56
+#define DB8500_DMA_MEMCPY_EV_2 57
+#define DB8500_DMA_MEMCPY_EV_3 58
+#define DB8500_DMA_MEMCPY_EV_4 59
+#define DB8500_DMA_MEMCPY_EV_5 60
+
+static int dma40_memcpy_channels[] = {
+ DB8500_DMA_MEMCPY_EV_0,
+ DB8500_DMA_MEMCPY_EV_1,
+ DB8500_DMA_MEMCPY_EV_2,
+ DB8500_DMA_MEMCPY_EV_3,
+ DB8500_DMA_MEMCPY_EV_4,
+ DB8500_DMA_MEMCPY_EV_5,
+};
/**
* enum 40_command - The different commands and/or statuses.