diff options
author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2008-12-10 20:36:53 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2008-12-10 20:36:53 -0500 |
commit | a50f18c70049a73bd663ff889ef10d1097fd53f9 (patch) | |
tree | f0d420bdeea7517a9157a4b84c920d6917b60898 /arch | |
parent | b1c056d20caa6fdd3481b348567f1f91e98aaa4b (diff) |
ARM: OMAP3: DMA: Fix for sDMA Errata 1.113
SDMA channel is not disabled after transaction error. So explicitly disable it.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked By : Nishant kamat <nskamat@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/plat-omap/dma.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 50f8b4ad9a09..3df374055796 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
@@ -1848,9 +1848,22 @@ static int omap2_dma_handle_ch(int ch) | |||
1848 | printk(KERN_INFO | 1848 | printk(KERN_INFO |
1849 | "DMA synchronization event drop occurred with device " | 1849 | "DMA synchronization event drop occurred with device " |
1850 | "%d\n", dma_chan[ch].dev_id); | 1850 | "%d\n", dma_chan[ch].dev_id); |
1851 | if (unlikely(status & OMAP2_DMA_TRANS_ERR_IRQ)) | 1851 | if (unlikely(status & OMAP2_DMA_TRANS_ERR_IRQ)) { |
1852 | printk(KERN_INFO "DMA transaction error with device %d\n", | 1852 | printk(KERN_INFO "DMA transaction error with device %d\n", |
1853 | dma_chan[ch].dev_id); | 1853 | dma_chan[ch].dev_id); |
1854 | if (cpu_class_is_omap2()) { | ||
1855 | /* Errata: sDMA Channel is not disabled | ||
1856 | * after a transaction error. So we explicitely | ||
1857 | * disable the channel | ||
1858 | */ | ||
1859 | u32 ccr; | ||
1860 | |||
1861 | ccr = dma_read(CCR(ch)); | ||
1862 | ccr &= ~OMAP_DMA_CCR_EN; | ||
1863 | dma_write(ccr, CCR(ch)); | ||
1864 | dma_chan[ch].flags &= ~OMAP_DMA_ACTIVE; | ||
1865 | } | ||
1866 | } | ||
1854 | if (unlikely(status & OMAP2_DMA_SECURE_ERR_IRQ)) | 1867 | if (unlikely(status & OMAP2_DMA_SECURE_ERR_IRQ)) |
1855 | printk(KERN_INFO "DMA secure error with device %d\n", | 1868 | printk(KERN_INFO "DMA secure error with device %d\n", |
1856 | dma_chan[ch].dev_id); | 1869 | dma_chan[ch].dev_id); |