Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
  dma: Add SoF and EoF debugging to ipu_idmac.c, minor cleanup
  dw_dmac: add cyclic API to DW DMA driver
  dmaengine: Add privatecnt to revert DMA_PRIVATE property
  dmatest: add dma interrupts and callbacks
  dmatest: add xor test
  dmaengine: allow dma support for async_tx to be toggled
  async_tx: provide __async_inline for HAS_DMA=n archs
  dmaengine: kill some unused headers
  dmaengine: initialize tx_list in dma_async_tx_descriptor_init
  dma: i.MX31 IPU DMA robustness improvements
  dma: improve section assignment in i.MX31 IPU DMA driver
  dma: ipu_idmac driver cosmetic clean-up
  dmaengine: fail device registration if channel registration fails

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/dma/dw_dmac_regs.h b/drivers/dma/dw_dmac_regs.h
index b252b202c5cf..13a580767031 100644
--- a/drivers/dma/dw_dmac_regs.h
+++ b/drivers/dma/dw_dmac_regs.h
@@ -126,6 +126,10 @@ struct dw_dma_regs {
 
 #define DW_REGLEN               0x400
 
+enum dw_dmac_flags {
+        DW_DMA_IS_CYCLIC = 0,
+};
+
 struct dw_dma_chan {
         struct dma_chan         chan;
         void __iomem            *ch_regs;
@@ -134,10 +138,12 @@ struct dw_dma_chan {
         spinlock_t              lock;
 
         /* these other elements are all protected by lock */
+        unsigned long           flags;
         dma_cookie_t            completed;
         struct list_head        active_list;
         struct list_head        queue;
         struct list_head        free_list;
+        struct dw_cyclic_desc   *cdesc;
 
         unsigned int            descs_allocated;
 };
@@ -158,7 +164,6 @@ static inline struct dw_dma_chan *to_dw_dma_chan(struct dma_chan *chan)
         return container_of(chan, struct dw_dma_chan, chan);
 }
 
-
 struct dw_dma {
         struct dma_device       dma;
         void __iomem            *regs;