Commit 3d598f47 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Vinod Koul

dmaengine: dw: move dw_dmac.h to where it belongs to

There is a common storage for platform data related structures and definitions
inside kernel source tree. The patch moves file from include/linux to
include/linux/platform_data and renames it acoordingly. The users are also
updated.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
[For the arch/avr32/.* and .*sound/atmel.*]
Acked-by: default avatarHans-Christian Egtvedt <egtvedt@samfundet.no>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent a22e2922
...@@ -7875,7 +7875,7 @@ SYNOPSYS DESIGNWARE DMAC DRIVER ...@@ -7875,7 +7875,7 @@ SYNOPSYS DESIGNWARE DMAC DRIVER
M: Viresh Kumar <viresh.linux@gmail.com> M: Viresh Kumar <viresh.linux@gmail.com>
M: Andy Shevchenko <andriy.shevchenko@linux.intel.com> M: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
S: Maintained S: Maintained
F: include/linux/dw_dmac.h F: include/linux/platform_data/dma-dw.h
F: drivers/dma/dw/ F: drivers/dma/dw/
SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
*/ */
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/dw_dmac.h> #include <linux/platform_data/dma-dw.h>
#include <linux/fb.h> #include <linux/fb.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
......
#ifndef __MACH_ATMEL_MCI_H #ifndef __MACH_ATMEL_MCI_H
#define __MACH_ATMEL_MCI_H #define __MACH_ATMEL_MCI_H
#include <linux/dw_dmac.h> #include <linux/platform_data/dma-dw.h>
/** /**
* struct mci_dma_data - DMA data for MCI interface * struct mci_dma_data - DMA data for MCI interface
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#define _DW_DMAC_INTERNAL_H #define _DW_DMAC_INTERNAL_H
#include <linux/device.h> #include <linux/device.h>
#include <linux/dw_dmac.h> #include <linux/platform_data/dma-dw.h>
#include "regs.h" #include "regs.h"
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/dmaengine.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_CHANNELS 8
#define DW_DMA_MAX_NR_REQUESTS 16 #define DW_DMA_MAX_NR_REQUESTS 16
...@@ -161,7 +161,7 @@ struct dw_dma_regs { ...@@ -161,7 +161,7 @@ struct dw_dma_regs {
#define DWC_CTLH_DONE 0x00001000 #define DWC_CTLH_DONE 0x00001000
#define DWC_CTLH_BLOCK_TS_MASK 0x00000fff #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_MASK (0x7 << 5) /* priority mask */
#define DWC_CFGL_CH_PRIOR(x) ((x) << 5) /* priority */ #define DWC_CFGL_CH_PRIOR(x) ((x) << 5) /* priority */
#define DWC_CFGL_CH_SUSP (1 << 8) /* pause xfer */ #define DWC_CFGL_CH_SUSP (1 << 8) /* pause xfer */
...@@ -172,7 +172,7 @@ struct dw_dma_regs { ...@@ -172,7 +172,7 @@ struct dw_dma_regs {
#define DWC_CFGL_RELOAD_SAR (1 << 30) #define DWC_CFGL_RELOAD_SAR (1 << 30)
#define DWC_CFGL_RELOAD_DAR (1 << 31) #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_DS_UPD_EN (1 << 5)
#define DWC_CFGH_SS_UPD_EN (1 << 6) #define DWC_CFGH_SS_UPD_EN (1 << 6)
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#ifndef __INCLUDE_SOUND_ATMEL_ABDAC_H #ifndef __INCLUDE_SOUND_ATMEL_ABDAC_H
#define __INCLUDE_SOUND_ATMEL_ABDAC_H #define __INCLUDE_SOUND_ATMEL_ABDAC_H
#include <linux/dw_dmac.h> #include <linux/platform_data/dma-dw.h>
/** /**
* struct atmel_abdac_pdata - board specific ABDAC configuration * struct atmel_abdac_pdata - board specific ABDAC configuration
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#ifndef __INCLUDE_SOUND_ATMEL_AC97C_H #ifndef __INCLUDE_SOUND_ATMEL_AC97C_H
#define __INCLUDE_SOUND_ATMEL_AC97C_H #define __INCLUDE_SOUND_ATMEL_AC97C_H
#include <linux/dw_dmac.h> #include <linux/platform_data/dma-dw.h>
#define AC97C_CAPTURE 0x01 #define AC97C_CAPTURE 0x01
#define AC97C_PLAYBACK 0x02 #define AC97C_PLAYBACK 0x02
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/bitmap.h> #include <linux/bitmap.h>
#include <linux/dw_dmac.h> #include <linux/platform_data/dma-dw.h>
#include <linux/dmaengine.h> #include <linux/dmaengine.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/init.h> #include <linux/init.h>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <sound/atmel-ac97c.h> #include <sound/atmel-ac97c.h>
#include <sound/memalloc.h> #include <sound/memalloc.h>
#include <linux/dw_dmac.h> #include <linux/platform_data/dma-dw.h>
#include <mach/cpu.h> #include <mach/cpu.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment