summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAnuj Aggarwal <anuj.aggarwal@ti.com>2009-10-14 09:56:34 -0700
committerTony Lindgren <tony@atomide.com>2009-10-14 09:56:34 -0700
commit70cf644c34a5f2dd183b4f01b0e8cdac834c1e17 (patch)
tree27a75fc7eda52e17afd5187ac428a6b565219d38 /arch
parentdc6e56b199a5b11b53786c67f5f1c7af0195d223 (diff)
downloadop-kernel-dev-70cf644c34a5f2dd183b4f01b0e8cdac834c1e17.zip
op-kernel-dev-70cf644c34a5f2dd183b4f01b0e8cdac834c1e17.tar.gz
omap: SDMA: Fixing bug in omap_dma_set_global_params()
Argument tparams was not being used to program global register GCR.HI_THREAD_RESERVED. This patch fixes the same. Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-omap/dma.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index fd3154a..0eb676d 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -829,10 +829,10 @@ EXPORT_SYMBOL(omap_free_dma);
*
* @param arb_rate
* @param max_fifo_depth
- * @param tparams - Number of thereads to reserve : DMA_THREAD_RESERVE_NORM
- * DMA_THREAD_RESERVE_ONET
- * DMA_THREAD_RESERVE_TWOT
- * DMA_THREAD_RESERVE_THREET
+ * @param tparams - Number of threads to reserve : DMA_THREAD_RESERVE_NORM
+ * DMA_THREAD_RESERVE_ONET
+ * DMA_THREAD_RESERVE_TWOT
+ * DMA_THREAD_RESERVE_THREET
*/
void
omap_dma_set_global_params(int arb_rate, int max_fifo_depth, int tparams)
@@ -844,11 +844,14 @@ omap_dma_set_global_params(int arb_rate, int max_fifo_depth, int tparams)
return;
}
+ if (max_fifo_depth == 0)
+ max_fifo_depth = 1;
if (arb_rate == 0)
arb_rate = 1;
- reg = (arb_rate & 0xff) << 16;
- reg |= (0xff & max_fifo_depth);
+ reg = 0xff & max_fifo_depth;
+ reg |= (0x3 & tparams) << 12;
+ reg |= (arb_rate & 0xff) << 16;
dma_write(reg, GCR);
}
OpenPOWER on IntegriCloud