aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2014-05-16 08:17:14 -0400
committerSekhar Nori <nsekhar@ti.com>2014-05-22 04:56:45 -0400
commit643efcff5208b5521060779f769593ca3837887d (patch)
treed8b550280a9c2abc959ba814f200852eac60ef06
parent6710ea7a0287be4380ac81c37aa6e2683a04b153 (diff)
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>
-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)
1646 edma_cc[j]->num_tc = info[j]->n_tc; 1646 edma_cc[j]->num_tc = info[j]->n_tc;
1647 1647
1648 edma_cc[j]->default_queue = info[j]->default_queue; 1648 edma_cc[j]->default_queue = info[j]->default_queue;
1649 edma_cc[j]->num_region = info[j]->n_region;
1649 1650
1650 dev_dbg(&pdev->dev, "DMA REG BASE ADDR=%p\n", 1651 dev_dbg(&pdev->dev, "DMA REG BASE ADDR=%p\n",
1651 edmacc_regs_base[j]); 1652 edmacc_regs_base[j]);
@@ -1743,7 +1744,7 @@ static int edma_probe(struct platform_device *pdev)
1743 if (edma_read(j, EDMA_CCCFG) & CHMAP_EXIST) 1744 if (edma_read(j, EDMA_CCCFG) & CHMAP_EXIST)
1744 map_dmach_param(j); 1745 map_dmach_param(j);
1745 1746
1746 for (i = 0; i < info[j]->n_region; i++) { 1747 for (i = 0; i < edma_cc[j]->num_region; i++) {
1747 edma_write_array2(j, EDMA_DRAE, i, 0, 0x0); 1748 edma_write_array2(j, EDMA_DRAE, i, 0, 0x0);
1748 edma_write_array2(j, EDMA_DRAE, i, 1, 0x0); 1749 edma_write_array2(j, EDMA_DRAE, i, 1, 0x0);
1749 edma_write_array(j, EDMA_QRAE, i, 0x0); 1750 edma_write_array(j, EDMA_QRAE, i, 0x0);