Skip to content

Commit

Permalink
davinci: Keep count of channel controllers on a platform
Browse files Browse the repository at this point in the history
Some architectures have only one channel controller, but the
edma_alloc_channel api loops twice to findout the free channel
available in EDMA_CHANNEL_ANY case. A new variable has been
introduced to keep count of number of channel controllers being
used on a particular architecture.

Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
  • Loading branch information
Sudhakar Rajashekhara authored and Kevin Hilman committed Feb 4, 2010
1 parent 0e6cb8d commit 2d51750
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion arch/arm/mach-davinci/dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ struct edma {
};

static struct edma *edma_info[EDMA_MAX_CC];
static int arch_num_cc;

/* dummy param set used to (re)initialize parameter RAM slots */
static const struct edmacc_param dummy_paramset = {
Expand Down Expand Up @@ -602,7 +603,7 @@ int edma_alloc_channel(int channel,
}

if (channel < 0) {
for (i = 0; i < EDMA_MAX_CC; i++) {
for (i = 0; i < arch_num_cc; i++) {
channel = 0;
for (;;) {
channel = find_next_bit(edma_info[i]->
Expand Down Expand Up @@ -1467,6 +1468,7 @@ static int __init edma_probe(struct platform_device *pdev)
edma_write_array2(j, EDMA_DRAE, i, 1, 0x0);
edma_write_array(j, EDMA_QRAE, i, 0x0);
}
arch_num_cc++;
}

if (tc_errs_handled) {
Expand Down

0 comments on commit 2d51750

Please sign in to comment.