dmaengine: dw: apply both HS interfaces and remove slave_id usage

[firefly-linux-kernel-4.4.55.git] / drivers / dma / dw / regs.h

diff --git a/drivers/dma/dw/regs.h b/drivers/dma/dw/regs.h
index bb98d3e91e8b2a6a656ba58bc31739c620e4c75a..0e82d9972c17be62ca897ef632a024ff319c0f00 100644 (file)
--- a/drivers/dma/dw/regs.h
+++ b/drivers/dma/dw/regs.h
@@ -11,7 +11,7 @@
 
 #include <linux/interrupt.h>
 #include <linux/dmaengine.h>
-#include <linux/dw_dmac.h>
+#include <linux/platform_data/dma-dw.h>
 
 #define DW_DMA_MAX_NR_CHANNELS 8
 #define DW_DMA_MAX_NR_REQUESTS 16
@@ -161,7 +161,7 @@ struct dw_dma_regs {
 #define DWC_CTLH_DONE          0x00001000
 #define DWC_CTLH_BLOCK_TS_MASK 0x00000fff
 
-/* Bitfields in CFG_LO. Platform-configurable bits are in <linux/dw_dmac.h> */
+/* Bitfields in CFG_LO. Platform-configurable bits are in <linux/platform_data/dma-dw.h> */
 #define DWC_CFGL_CH_PRIOR_MASK (0x7 << 5)      /* priority mask */
 #define DWC_CFGL_CH_PRIOR(x)   ((x) << 5)      /* priority */
 #define DWC_CFGL_CH_SUSP       (1 << 8)        /* pause xfer */
@@ -172,7 +172,7 @@ struct dw_dma_regs {
 #define DWC_CFGL_RELOAD_SAR    (1 << 30)
 #define DWC_CFGL_RELOAD_DAR    (1 << 31)
 
-/* Bitfields in CFG_HI. Platform-configurable bits are in <linux/dw_dmac.h> */
+/* Bitfields in CFG_HI. Platform-configurable bits are in <linux/platform_data/dma-dw.h> */
 #define DWC_CFGH_DS_UPD_EN     (1 << 5)
 #define DWC_CFGH_SS_UPD_EN     (1 << 6)
 
@@ -221,9 +221,10 @@ struct dw_dma_chan {
        bool                    nollp;
 
        /* custom slave configuration */
-       unsigned int            request_line;
-       unsigned char           src_master;
-       unsigned char           dst_master;
+       u8                      src_id;
+       u8                      dst_id;
+       u8                      src_master;
+       u8                      dst_master;
 
        /* configuration passed via DMA_SLAVE_CONFIG */
        struct dma_slave_config dma_sconfig;