summaryrefslogtreecommitdiffstats
path: root/arch/arm/common
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2014-05-16 14:17:14 +0200
committerSekhar Nori <nsekhar@ti.com>2014-05-22 10:56:45 +0200
commit643efcff5208b5521060779f769593ca3837887d (patch)
treed8b550280a9c2abc959ba814f200852eac60ef06 /arch/arm/common
parentARM: edma: Remove num_cc member from struct edma (diff)
downloadlinux-643efcff5208b5521060779f769593ca3837887d.tar.xz
linux-643efcff5208b5521060779f769593ca3837887d.zip
ARM: edma: Save number of regions from pdata to struct edma
To be consistent in the code that we take parameters from edma_cc[j] struct and not randomly from info[j] as well. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/common')
-rw-r--r--arch/arm/common/edma.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
index 90dd7b6013bb..79097d880d50 100644
--- a/arch/arm/common/edma.c
+++ b/arch/arm/common/edma.c
@@ -1646,6 +1646,7 @@ static int edma_probe(struct platform_device *pdev)
edma_cc[j]->num_tc = info[j]->n_tc;
edma_cc[j]->default_queue = info[j]->default_queue;
+ edma_cc[j]->num_region = info[j]->n_region;
dev_dbg(&pdev->dev, "DMA REG BASE ADDR=%p\n",
edmacc_regs_base[j]);
@@ -1743,7 +1744,7 @@ static int edma_probe(struct platform_device *pdev)
if (edma_read(j, EDMA_CCCFG) & CHMAP_EXIST)
map_dmach_param(j);
- for (i = 0; i < info[j]->n_region; i++) {
+ for (i = 0; i < edma_cc[j]->num_region; i++) {
edma_write_array2(j, EDMA_DRAE, i, 0, 0x0);
edma_write_array2(j, EDMA_DRAE, i, 1, 0x0);
edma_write_array(j, EDMA_QRAE, i, 0x0);