Linus Torvalds c511dc1fb6 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ... Pull slave-dmaengine update from Vinod Koul: "This time we have a new dmaengine driver from the tegra folks. Also we have Guennadi's cleanup of sh drivers which incudes a library for sh drivers. And the usual odd fixes in bunch of drivers and some nice cleanup of dw_dmac from Andy." Fix up conflicts in drivers/mmc/host/sh_mmcif.c * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (46 commits) dmaengine: Cleanup logging messages mmc: sh_mmcif: switch to the new DMA channel allocation and configuration dma: sh: provide a migration path for slave drivers to stop using .private dma: sh: use an integer slave ID to improve API compatibility dmaengine: shdma: prepare to stop using struct dma_chan::private sh: remove unused DMA device pointer from SIU platform data ASoC: siu: don't use DMA device for channel filtering dmaengine: shdma: (cosmetic) simplify a static function dmaengine: at_hdmac: add a few const qualifiers dw_dmac: use 'u32' for LLI structure members, not dma_addr_t dw_dmac: mark dwc_dump_lli inline dma: mxs-dma: Export missing symbols from mxs-dma.c dma: shdma: convert to the shdma base library ASoC: fsi: prepare for conversion to the shdma base library usb: renesas_usbhs: prepare for conversion to the shdma base library ASoC: siu: prepare for conversion to the shdma base library serial: sh-sci: prepare for conversion to the shdma base library mmc: sh_mobile_sdhi: prepare for conversion to the shdma base library mmc: sh_mmcif: remove unneeded struct sh_mmcif_dma, prepare to shdma conversion dma: shdma: prepare for conversion to the shdma base library ...		2012-07-24 17:12:54 -07:00
..
ioat	dmaengine-fixes for 3.4-rc3	2012-04-10 15:30:16 -07:00
ipu	dma: ipu: remove the use of ipu_platform_data	2012-07-01 21:57:43 +08:00
ppc4xx	dmaengine: ensure all DMA engine drivers initialize their cookies	2012-03-13 11:37:42 +05:30
sh	dma: sh: provide a migration path for slave drivers to stop using .private	2012-07-20 11:28:20 +05:30
amba-pl08x.c	dmaengine: Use dma_sg_len(sg) instead of sg->length	2012-05-11 12:04:38 +05:30
at_hdmac_regs.h	dmaengine: at_hdmac: take maxburst from slave configuration	2012-05-15 08:47:18 +05:30
at_hdmac.c	dmaengine: at_hdmac: add a few const qualifiers	2012-07-16 12:05:45 +05:30
coh901318_lli.c	dmaengine: Use sg_dma_address instead of sg_phys	2012-05-11 12:04:38 +05:30
coh901318_lli.h	dmaengine: move drivers to dma_transfer_direction	2011-10-27 20:53:43 +05:30
coh901318.c	dma: coh901318: use devm allocation	2012-06-14 08:42:26 +05:30
dmaengine.c	dmaengine: Cleanup logging messages	2012-07-20 11:44:19 +05:30
dmaengine.h	dmaengine: consolidate initialization of cookies	2012-03-13 11:37:22 +05:30
dmatest.c	dmaengine: fix missing 'cnt' in ?: in dmatest	2012-01-23 11:43:18 -08:00
dw_dmac_regs.h	dw_dmac: use 'u32' for LLI structure members, not dma_addr_t	2012-07-16 12:03:07 +05:30
dw_dmac.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-07-24 17:12:54 -07:00
ep93xx_dma.c	arm-soc: driver specific updates	2012-05-26 12:22:27 -07:00
fsldma.c	dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic	2012-03-21 19:20:23 +05:30
fsldma.h	dmaengine: move last completed cookie into generic dma_chan structure	2012-03-13 11:36:06 +05:30
imx-dma.c	dmaengine: Use dma_sg_len(sg) instead of sg->length	2012-05-11 12:04:38 +05:30
imx-sdma.c	dma: imx-sdma: buf_tail should be initialize in prepare function	2012-06-07 13:48:42 +05:30
intel_mid_dma_regs.h	dmaengine: move last completed cookie into generic dma_chan structure	2012-03-13 11:36:06 +05:30
intel_mid_dma.c	dmaengine: Use dma_sg_len(sg) instead of sg->length	2012-05-11 12:04:38 +05:30
iop-adma.c	dmaengine-fixes for 3.4-rc3	2012-04-10 15:30:16 -07:00
iovlock.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
Kconfig	dmaengine: mmp_tdma: fix the arch dependency	2012-06-23 13:14:17 +05:30
Makefile	dma: move shdma driver to an own directory	2012-07-13 09:12:59 +05:30
mmp_tdma.c	dmaengine: mmp_tdma: add mmp tdma support	2012-06-20 16:28:41 +05:30
mpc512x_dma.c	dmaengine: consolidate initialization of cookies	2012-03-13 11:37:22 +05:30
mv_xor.c	ARM: Orion: XOR: Add support for clk	2012-05-08 16:34:02 -07:00
mv_xor.h	ARM: Orion: XOR: Add support for clk	2012-05-08 16:34:02 -07:00
mxs-dma.c	dma: mxs-dma: Export missing symbols from mxs-dma.c	2012-07-16 11:59:22 +05:30
pch_dma.c	dmaengine: Use sg_dma_address instead of sg_phys	2012-05-11 12:04:38 +05:30
pl330.c	DMA: PL330: Fix racy mutex unlock	2012-06-14 08:39:52 +05:30
sa11x0-dma.c	ARM: sa11x0: fix build errors from DMA engine API updates	2012-03-30 11:46:20 +01:00
sirf-dma.c	dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic	2012-03-21 19:20:23 +05:30
ste_dma40_ll.c	dma40: cyclic xfer support	2011-01-30 22:27:21 -08:00
ste_dma40_ll.h	dma40: Improve the logic of stopping logical chan	2012-04-23 17:56:17 +05:30
ste_dma40.c	dmaengine: Use dma_sg_len(sg) instead of sg->length	2012-05-11 12:04:38 +05:30
tegra20-apb-dma.c	dma: tegra: rename driver and compatible to match with dts	2012-07-13 08:49:54 +05:30
timb_dma.c	dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic	2012-03-21 19:20:23 +05:30
TODO	dmaengine: remove ste_dma40 from issue_pending TODO	2011-07-14 04:02:08 +05:30
txx9dmac.c	dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic	2012-03-21 19:20:23 +05:30
txx9dmac.h	dmaengine: move last completed cookie into generic dma_chan structure	2012-03-13 11:36:06 +05:30