]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
OMAP: DMA: Fix CCR programming for request line > 63
authorAnand Gadiyar <gadiyar@ti.com>
Mon, 10 Nov 2008 11:08:17 +0000 (16:38 +0530)
committerTony Lindgren <tony@atomide.com>
Thu, 8 Jan 2009 12:46:04 +0000 (14:46 +0200)
commit2bb68043beee74ff50e57a6377f6b4f9b4ff4558
treebccf5face5fe47e0234d4a2c94b89b8cd07d7d2f
parent19d34d9aaf0c830dd9456731a7bb85b51670c1a7
OMAP: DMA: Fix CCR programming for request line > 63

Bug in existing code causes synchro control to be set +32 if request
line greater than 63 is used.

Reported by Wenbiao Wang

Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
+++ linux-omap-2.6/arch/arm/plat-omap/dma.c 2009-01-08 14:44:46.000000000 +0200
@@ -279,10 +279,7 @@ void omap_set_dma_transfer_params(int lc

  val = dma_read(CCR(lch));
  val &= ~(3 << 19);
- if (dma_trigger > 63)
- val |= 1 << 20;
- if (dma_trigger > 31)
- val |= 1 << 19;
+ val |= ((dma_trigger & ~(0x1f)) << 14);

  val &= ~(0x1f);
  val |= (dma_trigger & 0x1f);
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/plat-omap/dma.c