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>

This commit is contained in:

Arnd Bergmann

2013-04-19 22:50:41 +02:00

parent 1b361942b5 e34d3865ee

commit f54ae513d3

16 changed files with 219 additions and 302 deletions

									
										include/linux/pata_arasan_cf_data.h
									
		-2
	
												View File
												
				@@ -37,8 +37,6 @@ struct arasan_cf_pdata {

					#define CF_BROKEN_PIO			(1)

					#define CF_BROKEN_MWDMA			(1 << 1)

					#define CF_BROKEN_UDMA			(1 << 2)

					/* This is platform specific data for the DMA controller */

					void *dma_priv;

				};

				static inline void