Merge tag 'fixes-for-v3.18-rc2' of https://github.com/rjarzmik/linux into fixes

[cascardo/linux.git] / drivers / dma / mmp_tdma.c

diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
index 6ad30e2..c6bd015 100644 (file)
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@ -148,10 +148,16 @@ static void mmp_tdma_chan_set_desc(struct mmp_tdma_chan *tdmac, dma_addr_t phys)
                                        tdmac->reg_base + TDCR);
 }
 
+static void mmp_tdma_enable_irq(struct mmp_tdma_chan *tdmac, bool enable)
+{
+       if (enable)
+               writel(TDIMR_COMP, tdmac->reg_base + TDIMR);
+       else
+               writel(0, tdmac->reg_base + TDIMR);
+}
+
 static void mmp_tdma_enable_chan(struct mmp_tdma_chan *tdmac)
 {
-       /* enable irq */
-       writel(TDIMR_COMP, tdmac->reg_base + TDIMR);
        /* enable dma chan */
        writel(readl(tdmac->reg_base + TDCR) | TDCR_CHANEN,
                                        tdmac->reg_base + TDCR);
@@ -163,9 +169,6 @@ static void mmp_tdma_disable_chan(struct mmp_tdma_chan *tdmac)
        writel(readl(tdmac->reg_base + TDCR) & ~TDCR_CHANEN,
                                        tdmac->reg_base + TDCR);
 
-       /* disable irq */
-       writel(0, tdmac->reg_base + TDIMR);
-
        tdmac->status = DMA_COMPLETE;
 }
 
@@ -434,6 +437,10 @@ static struct dma_async_tx_descriptor *mmp_tdma_prep_dma_cyclic(
                i++;
        }
 
+       /* enable interrupt */
+       if (flags & DMA_PREP_INTERRUPT)
+               mmp_tdma_enable_irq(tdmac, true);
+
        tdmac->buf_len = buf_len;
        tdmac->period_len = period_len;
        tdmac->pos = 0;
@@ -455,6 +462,8 @@ static int mmp_tdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
        switch (cmd) {
        case DMA_TERMINATE_ALL:
                mmp_tdma_disable_chan(tdmac);
+               /* disable interrupt */
+               mmp_tdma_enable_irq(tdmac, false);
                break;
        case DMA_PAUSE:
                mmp_tdma_pause_chan(tdmac);