]> Pileus Git - ~andy/linux/commit
Merge branch 'spear/dwdma' into late/cleanup
authorArnd Bergmann <arnd@arndb.de>
Fri, 19 Apr 2013 20:50:41 +0000 (22:50 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 19 Apr 2013 20:50:52 +0000 (22:50 +0200)
commitf54ae513d3d39b60bcc2ef446f1219f501d859bf
treea60c22feaee5265fa9b017bc504793ae1b531972
parent1b361942b53c33f38d55065c13785aadb5103a18
parente34d3865ee4a71195f91b23fd09e2619a5f727d3
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>