diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 22:50:41 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 22:50:52 +0200 |
| commit | f54ae513d3d39b60bcc2ef446f1219f501d859bf (patch) | |
| tree | a60c22feaee5265fa9b017bc504793ae1b531972 /arch/arm/mach-spear/generic.h | |
| parent | 1b361942b53c33f38d55065c13785aadb5103a18 (diff) | |
| parent | e34d3865ee4a71195f91b23fd09e2619a5f727d3 (diff) | |
| download | op-kernel-dev-f54ae513d3d39b60bcc2ef446f1219f501d859bf.zip op-kernel-dev-f54ae513d3d39b60bcc2ef446f1219f501d859bf.tar.gz | |
Merge branch 'spear/dwdma' into late/cleanup
This is a series originally prepared for inclusion in 3.9, which did
not work out because of dependencies on the dmaengine driver. All the
changes for the dmaengine code are merged in 3.9 now, so we can finally
do the switchover and remove the now unnecessary dma definitions for
spear13xx from the platform code.
The dma platform_data actually made up the majority of the spear13xx
platform code overall, so moving that into device tree files makes the
code substantially smaller.
* spear/dwdma:
ata: arasan: remove the need for platform_data
ARM: SPEAr13xx: Pass generic DW DMAC platform data from DT
serial: pl011: use generic DMA slave configuration if possible
spi: pl022: use generic DMA slave configuration if possible
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-spear/generic.h')
| -rw-r--r-- | arch/arm/mach-spear/generic.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-spear/generic.h b/arch/arm/mach-spear/generic.h index 8ba7e75..a9fd453 100644 --- a/arch/arm/mach-spear/generic.h +++ b/arch/arm/mach-spear/generic.h @@ -22,11 +22,6 @@ extern void spear13xx_timer_init(void); extern void spear3xx_timer_init(void); extern struct pl022_ssp_controller pl022_plat_data; extern struct pl08x_platform_data pl080_plat_data; -extern struct dw_dma_platform_data dmac_plat_data; -extern struct dw_dma_slave cf_dma_priv; -extern struct dw_dma_slave nand_read_dma_priv; -extern struct dw_dma_slave nand_write_dma_priv; -bool dw_dma_filter(struct dma_chan *chan, void *slave); void __init spear_setup_of_timer(void); void __init spear3xx_clk_init(void __iomem *misc_base, |
