summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSteven Miao <realmz6@gmail.com>2014-05-13 16:49:13 +0800
committerSteven Miao <realmz6@gmail.com>2014-06-11 00:13:22 +0800
commitff5ae12d84d3f7eaeb3850ff6de4289c0c849344 (patch)
treeeead1bf51fe047dac9a299b1941809ad02fe3d97 /arch
parentbc4fef6f32c56798bb17df9e98a6e07ba7dc4101 (diff)
downloadlinux-stable-ff5ae12d84d3f7eaeb3850ff6de4289c0c849344.tar.gz
linux-stable-ff5ae12d84d3f7eaeb3850ff6de4289c0c849344.tar.bz2
linux-stable-ff5ae12d84d3f7eaeb3850ff6de4289c0c849344.zip
Revert "blackfin: dma: current count mmr is read only"
curr_x_count/curr_y_count need to be cleared here, keep this workaround This reverts commit dfb02f95f5430e47d0c49adbc4469d08eea38b94. Signed-off-by: Steven Miao <realmz6@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/blackfin/include/asm/dma.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/dma.h b/arch/blackfin/include/asm/dma.h
index 8d1e4c2d2c36..40e9c2bbc6e3 100644
--- a/arch/blackfin/include/asm/dma.h
+++ b/arch/blackfin/include/asm/dma.h
@@ -316,6 +316,8 @@ static inline void disable_dma(unsigned int channel)
}
static inline void enable_dma(unsigned int channel)
{
+ dma_ch[channel].regs->curr_x_count = 0;
+ dma_ch[channel].regs->curr_y_count = 0;
dma_ch[channel].regs->cfg |= DMAEN;
}
int set_dma_callback(unsigned int channel, irq_handler_t callback, void *data);