X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=drivers%2Fdma%2Fdw_dmac_regs.h;h=13a580767031a3aac04046ffd563ef1d83f053b0;hb=d9de451989a88a2003ca06e524aca4665c0c7f06;hp=00fdd187bb0cf7ddbb5188cc33097f9739ee4ea7;hpb=9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6;p=mv-sheeva.git diff --git a/drivers/dma/dw_dmac_regs.h b/drivers/dma/dw_dmac_regs.h index 00fdd187bb0..13a58076703 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,12 +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_dma_slave *dws; + struct dw_cyclic_desc *cdesc; unsigned int descs_allocated; }; @@ -160,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;