Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a50f18c7 authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Tony Lindgren
Browse files

ARM: OMAP3: DMA: Fix for sDMA Errata 1.113 



SDMA channel is not disabled after transaction error. So explicitly disable it.

Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Acked By : Nishant kamat <nskamat@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent b1c056d2

arch/arm/plat-omap/dma.c

+14 −1
Original line number Diff line number Diff line
@@ -1848,9 +1848,22 @@ static int omap2_dma_handle_ch(int ch) 
		printk(KERN_INFO

		       "DMA synchronization event drop occurred with device "

		       "%d\n", dma_chan[ch].dev_id);

	if (unlikely(status & OMAP2_DMA_TRANS_ERR_IRQ))

	if (unlikely(status & OMAP2_DMA_TRANS_ERR_IRQ)) {

		printk(KERN_INFO "DMA transaction error with device %d\n",

		       dma_chan[ch].dev_id);

		if (cpu_class_is_omap2()) {

			/* Errata: sDMA Channel is not disabled

			 * after a transaction error. So we explicitely

			 * disable the channel

			 */

			u32 ccr;



			ccr = dma_read(CCR(ch));

			ccr &= ~OMAP_DMA_CCR_EN;

			dma_write(ccr, CCR(ch));

			dma_chan[ch].flags &= ~OMAP_DMA_ACTIVE;

		}

	}

	if (unlikely(status & OMAP2_DMA_SECURE_ERR_IRQ))

		printk(KERN_INFO "DMA secure error with device %d\n",

		       dma_chan[ch].dev_id);