UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-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
This commit is contained in:
Arnd Bergmann 2012-02-27 14:25:51 +00:00
parent d0cdd82c6e 0b7580ba9d
commit 5a8c271b26
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-davinci/dma.c
View File

@ -1508,12 +1508,8 @@ static int __init edma_probe(struct platform_device *pdev)
goto fail; 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++) 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_tc_mapping = info[j]->queue_tc_mapping;
queue_priority_mapping = info[j]->queue_priority_mapping; queue_priority_mapping = info[j]->queue_priority_mapping;

5
arch/arm/mach-davinci/include/mach/edma.h
View File

@ -250,6 +250,11 @@ struct edma_soc_info {
unsigned n_slot; unsigned n_slot;
unsigned n_tc; unsigned n_tc;
unsigned n_cc; 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; enum dma_event_q default_queue;
/* Resource reservation for other cores */ /* Resource reservation for other cores */