Skip to content

Commit

Permalink
Merge branch 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-…
Browse files Browse the repository at this point in the history
…davinci into next/fixes-non-critical

* 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-davinci:
  ARM: davinci: map default_queue to edma channels
  • Loading branch information
Arnd Bergmann committed Feb 27, 2012
2 parents d0cdd82 + 0b7580b commit 5a8c271
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 1 addition & 5 deletions arch/arm/mach-davinci/dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1508,12 +1508,8 @@ static int __init edma_probe(struct platform_device *pdev)
goto fail;
}

/* Everything lives on transfer controller 1 until otherwise
* specified. This way, long transfers on the low priority queue
* started by the codec engine will not cause audio defects.
*/
for (i = 0; i < edma_cc[j]->num_channels; i++)
map_dmach_queue(j, i, EVENTQ_1);
map_dmach_queue(j, i, info[j]->default_queue);

queue_tc_mapping = info[j]->queue_tc_mapping;
queue_priority_mapping = info[j]->queue_priority_mapping;
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/mach-davinci/include/mach/edma.h
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,11 @@ struct edma_soc_info {
unsigned n_slot;
unsigned n_tc;
unsigned n_cc;
/*
* Default queue is expected to be a low-priority queue.
* This way, long transfers on the default queue started
* by the codec engine will not cause audio defects.
*/
enum dma_event_q default_queue;

/* Resource reservation for other cores */
Expand Down

0 comments on commit 5a8c271

Please sign in to comment.