intel_mid_dma: change the slave interface

In 2.6.36 kernel, dma slave control command was introduced,
this patch changes the intel-mid-dma driver to this
new kernel slave interface

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

1 files changed, 1 insertions, 14 deletions

diff --git a/include/linux/intel_mid_dma.h b/include/linux/intel_mid_dma.h
index befe3fbd9e28..10496bd24c5c 100644
--- a/include/linux/intel_mid_dma.h
+++ b/include/linux/intel_mid_dma.h
@@ -28,14 +28,6 @@
 #include <linux/dmaengine.h>
 
 #define DMA_PREP_CIRCULAR_LIST          (1 << 10)
-/*DMA transaction width, src and dstn width would be same
-The DMA length must be width aligned,
-for 32 bit width the length must be 32 bit (4bytes) aligned only*/
-enum intel_mid_dma_width {
-        LNW_DMA_WIDTH_8BIT = 0x0,
-        LNW_DMA_WIDTH_16BIT = 0x1,
-        LNW_DMA_WIDTH_32BIT = 0x2,
-};
 
 /*DMA mode configurations*/
 enum intel_mid_dma_mode {
@@ -75,15 +67,10 @@ enum intel_mid_dma_msize {
  *              peripheral device connected to single DMAC
  */
 struct intel_mid_dma_slave {
-        enum dma_data_direction         dirn;
-        enum intel_mid_dma_width        src_width; /*width of DMA src txn*/
-        enum intel_mid_dma_width        dst_width; /*width of DMA dst txn*/
         enum intel_mid_dma_hs_mode      hs_mode;  /*handshaking*/
         enum intel_mid_dma_mode         cfg_mode; /*mode configuration*/
-        enum intel_mid_dma_msize        src_msize; /*size if src burst*/
-        enum intel_mid_dma_msize        dst_msize; /*size of dst burst*/
-        dma_addr_t                      per_addr; /*Peripheral address*/
         unsigned int            device_instance; /*0, 1 for periphral instance*/
+        struct dma_slave_config         dma_slave;
 };
 
 #endif /*__INTEL_MID_DMA_H__*/