Merge tag 'modules-for-v4.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / dma / dw / regs.h

diff --git a/drivers/dma/dw/regs.h b/drivers/dma/dw/regs.h
index 4b7bd783404663a5953cf457430d4348d5aeeee9..4e0128c627047741487123e8d51e38c010b6f914 100644 (file)
--- a/drivers/dma/dw/regs.h
+++ b/drivers/dma/dw/regs.h
@@ -12,7 +12,8 @@
 #include <linux/interrupt.h>
 #include <linux/dmaengine.h>
 
-#define DW_DMA_MAX_NR_CHANNELS 8
+#include "internal.h"
+
 #define DW_DMA_MAX_NR_REQUESTS 16
 
 /* flow controller */
@@ -245,10 +246,7 @@ struct dw_dma_chan {
        bool                    nollp;
 
        /* custom slave configuration */
-       u8                      src_id;
-       u8                      dst_id;
-       u8                      m_master;
-       u8                      p_master;
+       struct dw_dma_slave     dws;
 
        /* configuration passed via .device_config */
        struct dma_slave_config dma_sconfig;