Merge branch 'topic/idma' into for-linus

2 files changed, 4 insertions, 1 deletions

diff --git a/drivers/dma/idma64.c b/drivers/dma/idma64.c
index 3cb7b2c78197..1953e57505f4 100644
--- a/drivers/dma/idma64.c
+++ b/drivers/dma/idma64.c
@@ -289,6 +289,9 @@ static void idma64_desc_fill(struct idma64_chan *idma64c,
 
         /* Trigger an interrupt after the last block is transfered */
         lli->ctllo |= IDMA64C_CTLL_INT_EN;
+
+        /* Disable LLP transfer in the last block */
+        lli->ctllo &= ~(IDMA64C_CTLL_LLP_S_EN | IDMA64C_CTLL_LLP_D_EN);
 }
 
 static struct dma_async_tx_descriptor *idma64_prep_slave_sg(
diff --git a/drivers/dma/idma64.h b/drivers/dma/idma64.h
index 8423f13ed0da..dc6874424188 100644
--- a/drivers/dma/idma64.h
+++ b/drivers/dma/idma64.h
@@ -71,7 +71,7 @@
 #define IDMA64C_CFGH_SRC_PER(x)         ((x) << 0)      /* src peripheral */
 #define IDMA64C_CFGH_DST_PER(x)         ((x) << 4)      /* dst peripheral */
 #define IDMA64C_CFGH_RD_ISSUE_THD(x)    ((x) << 8)
-#define IDMA64C_CFGH_RW_ISSUE_THD(x)    ((x) << 18)
+#define IDMA64C_CFGH_WR_ISSUE_THD(x)    ((x) << 18)
 
 /* Interrupt registers */