Linus Torvalds a6dc77254b Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm ... Pull ARM DMA engine updates from Russell King: "This looks scary at first glance, but what it is is: - a rework of the sa11x0 DMA engine driver merged during the previous cycle, to extract a common set of helper functions for DMA engine implementations. - conversion of amba-pl08x.c to use these helper functions. - addition of OMAP DMA engine driver (using these helper functions), and conversion of some of the OMAP DMA users to use DMA engine. Nothing in the helper functions is ARM specific, so I hope that other implementations can consolidate some of their code by making use of these helpers. This has been sitting in linux-next most of the merge cycle, and has been tested by several OMAP folk. I've tested it on sa11x0 platforms, and given it my best shot on my broken platforms which have the amba-pl08x controller. The last point is the addition to feature-removal-schedule.txt, which will have a merge conflict. Between myself and TI, we're planning to remove the old TI DMA implementation next year." Fix up trivial add/add conflicts in Documentation/feature-removal-schedule.txt and drivers/dma/{Kconfig,Makefile} * 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm: (53 commits) ARM: 7481/1: OMAP2+: omap2plus_defconfig: enable OMAP DMA engine ARM: 7464/1: mmc: omap_hsmmc: ensure probe returns error if DMA channel request fails Add feature removal of old OMAP private DMA implementation mtd: omap2: remove private DMA API implementation mtd: omap2: add DMA engine support spi: omap2-mcspi: remove private DMA API implementation spi: omap2-mcspi: add DMA engine support ARM: omap: remove mmc platform data dma_mask and initialization mmc: omap: remove private DMA API implementation mmc: omap: add DMA engine support mmc: omap_hsmmc: remove private DMA API implementation mmc: omap_hsmmc: add DMA engine support dmaengine: omap: add support for cyclic DMA dmaengine: omap: add support for setting fi dmaengine: omap: add support for returning residue in tx_state method dmaengine: add OMAP DMA engine driver dmaengine: sa11x0-dma: add cyclic DMA support dmaengine: sa11x0-dma: fix DMA residue support dmaengine: PL08x: ensure all descriptors are freed when channel is released dmaengine: PL08x: get rid of write only pool_ctr and free_txd locking ...		2012-08-01 16:41:07 -07:00
..
bus.h	ARM: 7369/1: amba: add functions to add devices dynamically	2012-04-19 19:31:33 +01:00
clcd.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
kmi.h	[ARM] Move AMBA include files to include/linux/amba/	2006-01-07 13:52:45 +00:00
mmci.h	ARM: 7219/1: mmc: mmci: Change vdd_handler to a generic ios_handler	2012-01-20 00:00:56 +00:00
pl08x.h	dmaengine: PL08x: get rid of unnecessary checks in dma_slave_config	2012-07-01 14:15:48 +01:00
pl022.h	spi/pl022: cleanup pl022 header documentation	2012-07-02 13:55:36 +02:00
pl061.h	gpio: pl061: convert to use 0 for no irq	2012-01-04 10:10:19 -06:00
pl093.h	ARM: PL093: Header file for PL093 SSMC PrimeCell	2009-07-30 23:22:54 +01:00
pl330.h	DMA: PL330: Merge PL330 driver into drivers/dma/	2012-03-08 17:59:28 +05:30
serial.h	ARM: 7339/1: amba/serial.h: Include types.h for resolving dependency of type bool	2012-02-23 22:07:55 +00:00