aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/dw/internal.h2
-rw-r--r--drivers/dma/dw/regs.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dma/dw/internal.h b/drivers/dma/dw/internal.h
index 32667f9e0dda..43cc1dfad5c9 100644
--- a/drivers/dma/dw/internal.h
+++ b/drivers/dma/dw/internal.h
@@ -12,7 +12,7 @@
12#define _DW_DMAC_INTERNAL_H 12#define _DW_DMAC_INTERNAL_H
13 13
14#include <linux/device.h> 14#include <linux/device.h>
15#include <linux/dw_dmac.h> 15#include <linux/platform_data/dma-dw.h>
16 16
17#include "regs.h" 17#include "regs.h"
18 18
diff --git a/drivers/dma/dw/regs.h b/drivers/dma/dw/regs.h
index bb98d3e91e8b..af02439155e9 100644
--- a/drivers/dma/dw/regs.h
+++ b/drivers/dma/dw/regs.h
@@ -11,7 +11,7 @@
11 11
12#include <linux/interrupt.h> 12#include <linux/interrupt.h>
13#include <linux/dmaengine.h> 13#include <linux/dmaengine.h>
14#include <linux/dw_dmac.h> 14#include <linux/platform_data/dma-dw.h>
15 15
16#define DW_DMA_MAX_NR_CHANNELS 8 16#define DW_DMA_MAX_NR_CHANNELS 8
17#define DW_DMA_MAX_NR_REQUESTS 16 17#define DW_DMA_MAX_NR_REQUESTS 16
@@ -161,7 +161,7 @@ struct dw_dma_regs {
161#define DWC_CTLH_DONE 0x00001000 161#define DWC_CTLH_DONE 0x00001000
162#define DWC_CTLH_BLOCK_TS_MASK 0x00000fff 162#define DWC_CTLH_BLOCK_TS_MASK 0x00000fff
163 163
164/* Bitfields in CFG_LO. Platform-configurable bits are in <linux/dw_dmac.h> */ 164/* Bitfields in CFG_LO. Platform-configurable bits are in <linux/platform_data/dma-dw.h> */
165#define DWC_CFGL_CH_PRIOR_MASK (0x7 << 5) /* priority mask */ 165#define DWC_CFGL_CH_PRIOR_MASK (0x7 << 5) /* priority mask */
166#define DWC_CFGL_CH_PRIOR(x) ((x) << 5) /* priority */ 166#define DWC_CFGL_CH_PRIOR(x) ((x) << 5) /* priority */
167#define DWC_CFGL_CH_SUSP (1 << 8) /* pause xfer */ 167#define DWC_CFGL_CH_SUSP (1 << 8) /* pause xfer */
@@ -172,7 +172,7 @@ struct dw_dma_regs {
172#define DWC_CFGL_RELOAD_SAR (1 << 30) 172#define DWC_CFGL_RELOAD_SAR (1 << 30)
173#define DWC_CFGL_RELOAD_DAR (1 << 31) 173#define DWC_CFGL_RELOAD_DAR (1 << 31)
174 174
175/* Bitfields in CFG_HI. Platform-configurable bits are in <linux/dw_dmac.h> */ 175/* Bitfields in CFG_HI. Platform-configurable bits are in <linux/platform_data/dma-dw.h> */
176#define DWC_CFGH_DS_UPD_EN (1 << 5) 176#define DWC_CFGH_DS_UPD_EN (1 << 5)
177#define DWC_CFGH_SS_UPD_EN (1 << 6) 177#define DWC_CFGH_SS_UPD_EN (1 << 6)
178 178