summaryrefslogtreecommitdiffstats
path: root/arch/arm/common
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2014-05-16 15:17:09 +0300
committerSekhar Nori <nsekhar@ti.com>2014-05-22 10:47:46 +0530
commitcf4afc3d2b6e11e507692c422eaf2b2e691e00d7 (patch)
tree7d7da57ea9f77be9c3465cd0292b83d6b70bb995 /arch/arm/common
parent89df4bed0f25157700c0ade5ac5f0296150eaecd (diff)
downloadop-kernel-dev-cf4afc3d2b6e11e507692c422eaf2b2e691e00d7.zip
op-kernel-dev-cf4afc3d2b6e11e507692c422eaf2b2e691e00d7.tar.gz
ARM: edma: Take the number of tc from edma_soc_info (pdata)
Instead of saving the for loop length, take the num_tc value from the pdata. In case of DT boot set the n_tc to 3 as it is hardwired in edma_of_parse_dt() This is a temporary state since upcoming patch(es) will change how we are dealing with these parameters. 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.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
index fade9ad..fde56e2 100644
--- a/arch/arm/common/edma.c
+++ b/arch/arm/common/edma.c
@@ -1506,6 +1506,7 @@ static int edma_of_parse_dt(struct device *dev,
pdata->n_slot = value;
pdata->n_cc = 1;
+ pdata->n_tc = 3;
rsv_info = devm_kzalloc(dev, sizeof(struct edma_rsv_info), GFP_KERNEL);
if (!rsv_info)
@@ -1666,6 +1667,7 @@ static int edma_probe(struct platform_device *pdev)
EDMA_MAX_PARAMENTRY);
edma_cc[j]->num_cc = min_t(unsigned, info[j]->n_cc,
EDMA_MAX_CC);
+ edma_cc[j]->num_tc = info[j]->n_tc;
edma_cc[j]->default_queue = info[j]->default_queue;
@@ -1759,9 +1761,6 @@ static int edma_probe(struct platform_device *pdev)
map_queue_tc(j, queue_tc_mapping[i][0],
queue_tc_mapping[i][1]);
- /* Save the number of TCs */
- edma_cc[j]->num_tc = i;
-
/* Event queue priority mapping */
for (i = 0; queue_priority_mapping[i][0] != -1; i++)
assign_priority_to_queue(j,
OpenPOWER on IntegriCloud