diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-13 07:08:47 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-13 07:08:47 +0400 |
| commit | 88bbfb4a6267ff90a466ade9762d9a8fff2bb1bb (patch) | |
| tree | 5d7693dd6e3fe81bb72ec3d83e9f9a8bb9aac649 /arch/blackfin/include | |
| parent | 71998d1be4ae70e7d320cdd21595c1a02a29c61e (diff) | |
| parent | 51fdc6bf98802eb7019ec94dfd82f0e6cd1c82a8 (diff) | |
| download | linux-88bbfb4a6267ff90a466ade9762d9a8fff2bb1bb.tar.xz | |
Merge tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux
Pull blackfin updates from Steven Miao.
* tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
Revert "blackfin: dma: current count mmr is read only"
bf533: fix build error: add linux/gpio.h
Diffstat (limited to 'arch/blackfin/include')
| -rw-r--r-- | arch/blackfin/include/asm/dma.h | 2 |
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); |