DMAENGINE: DMA40 support paused channel status

[safe/jmp/linux-2.6] / drivers / dma / fsldma.h

diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h
index f8c2baa..cb4d6ff 100644 (file)
--- a/drivers/dma/fsldma.h
+++ b/drivers/dma/fsldma.h
@@ -108,7 +108,7 @@ struct fsldma_chan;
 #define FSL_DMA_MAX_CHANS_PER_DEVICE 4
 
 struct fsldma_device {
-       void __iomem *reg_base; /* DGSR register base */
+       void __iomem *regs;     /* DGSR register base */
        struct device *dev;
        struct dma_device common;
        struct fsldma_chan *chan[FSL_DMA_MAX_CHANS_PER_DEVICE];
@@ -128,10 +128,11 @@ struct fsldma_device {
 #define FSL_DMA_CHAN_START_EXT 0x00002000
 
 struct fsldma_chan {
-       struct fsldma_chan_regs __iomem *reg_base;
+       struct fsldma_chan_regs __iomem *regs;
        dma_cookie_t completed_cookie;  /* The maximum cookie completed */
        spinlock_t desc_lock;           /* Descriptor operation lock */
-       struct list_head ld_queue;      /* Link descriptors queue */
+       struct list_head ld_pending;    /* Link descriptors queue */
+       struct list_head ld_running;    /* Link descriptors queue */
        struct dma_chan common;         /* DMA common channel */
        struct dma_pool *desc_pool;     /* Descriptors pool */
        struct device *dev;             /* Channel device */
@@ -143,7 +144,7 @@ struct fsldma_chan {
        void (*toggle_ext_pause)(struct fsldma_chan *fsl_chan, int enable);
        void (*toggle_ext_start)(struct fsldma_chan *fsl_chan, int enable);
        void (*set_src_loop_size)(struct fsldma_chan *fsl_chan, int size);
-       void (*set_dest_loop_size)(struct fsldma_chan *fsl_chan, int size);
+       void (*set_dst_loop_size)(struct fsldma_chan *fsl_chan, int size);
        void (*set_request_count)(struct fsldma_chan *fsl_chan, int size);
 };