1 files changed, 19 insertions, 29 deletions

diff --git a/drivers/dma/shdma.h b/drivers/dma/shdma.h
index 2b4bc15a2c0a..153609a1e96c 100644
--- a/drivers/dma/shdma.h
+++ b/drivers/dma/shdma.h
@@ -13,48 +13,38 @@
 #ifndef __DMA_SHDMA_H
 #define __DMA_SHDMA_H
 
-#include <linux/device.h>
-#include <linux/dmapool.h>
 #include <linux/dmaengine.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+
+#include <asm/dmaengine.h>
 
 #define SH_DMA_TCR_MAX 0x00FFFFFF       /* 16MB */
 
-struct sh_dmae_regs {
-        u32 sar; /* SAR / source address */
-        u32 dar; /* DAR / destination address */
-        u32 tcr; /* TCR / transfer count */
-};
-
-struct sh_desc {
-        struct list_head tx_list;
-        struct sh_dmae_regs hw;
-        struct list_head node;
-        struct dma_async_tx_descriptor async_tx;
-        int mark;
-};
+struct device;
 
 struct sh_dmae_chan {
         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_free;               /* Link descriptors free */
-        struct dma_chan common;                 /* DMA common channel */
-        struct device *dev;                             /* Channel device */
+        spinlock_t desc_lock;           /* Descriptor operation lock */
+        struct list_head ld_queue;      /* Link descriptors queue */
+        struct list_head ld_free;       /* Link descriptors free */
+        struct dma_chan common;         /* DMA common channel */
+        struct device *dev;             /* Channel device */
         struct tasklet_struct tasklet;  /* Tasklet */
-        int descs_allocated;                    /* desc count */
+        int descs_allocated;            /* desc count */
+        int xmit_shift;                 /* log_2(bytes_per_xfer) */
+        int irq;
         int id;                         /* Raw id of this channel */
-        char dev_id[16];        /* unique name per DMAC of channel */
-
-        /* Set chcr */
-        int (*set_chcr)(struct sh_dmae_chan *sh_chan, u32 regs);
-        /* Set DMA resource */
-        int (*set_dmars)(struct sh_dmae_chan *sh_chan, u16 res);
+        u32 __iomem *base;
+        char dev_id[16];                /* unique name per DMAC of channel */
 };
 
 struct sh_dmae_device {
         struct dma_device common;
-        struct sh_dmae_chan *chan[MAX_DMA_CHANNELS];
-        struct sh_dmae_pdata pdata;
+        struct sh_dmae_chan *chan[SH_DMAC_MAX_CHANNELS];
+        struct sh_dmae_pdata *pdata;
+        u32 __iomem *chan_reg;
+        u16 __iomem *dmars;
 };
 
 #define to_sh_chan(chan) container_of(chan, struct sh_dmae_chan, common)