diff options
author | Ido Yariv <ido@wizery.com> | 2011-07-10 15:14:35 +0200 |
---|---|---|
committer | Sekhar Nori <nsekhar@ti.com> | 2011-09-17 12:24:08 +0200 |
commit | f23fe857bbea393b4b94fe2218c98d934bd3d4cf (patch) | |
tree | 39661f5a8db2b71a3efcd4dd19c5133462de87f4 /arch/arm/mach-davinci/dma.c | |
parent | Linux 3.1-rc6 (diff) | |
download | linux-f23fe857bbea393b4b94fe2218c98d934bd3d4cf.tar.xz linux-f23fe857bbea393b4b94fe2218c98d934bd3d4cf.zip |
ARM: davinci: Explicitly set channel controllers' default queues
Davinci platforms may define a default queue for each channel
controller. If one is not defined, the default queue is set to EVENTQ_1.
However, there's no way to distinguish between an unset default queue to
one that is set to EVENTQ_0, as EVENTQ_0 = 0.
Explicitly specify the default queue for all channel controllers on all
Davinci platforms to EVENTQ_1, and don't overwrite it in the EDMA probe
function.
One exception is the DA850 board, for which EVENTQ_1 is not a valid
option for its second channel controller. Use EVENTQ_0 instead for that
channel controller.
Signed-off-by: Ido Yariv <ido@wizery.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/dma.c')
-rw-r--r-- | arch/arm/mach-davinci/dma.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c index 6b9669869c46..6ba4191d6570 100644 --- a/arch/arm/mach-davinci/dma.c +++ b/arch/arm/mach-davinci/dma.c @@ -1450,8 +1450,6 @@ static int __init edma_probe(struct platform_device *pdev) EDMA_MAX_CC); edma_cc[j]->default_queue = info[j]->default_queue; - if (!edma_cc[j]->default_queue) - edma_cc[j]->default_queue = EVENTQ_1; dev_dbg(&pdev->dev, "DMA REG BASE ADDR=%p\n", edmacc_regs_base[j]); |