Linus Torvalds ef08e78268 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ... Pull slave-dmaengine update from Vinod Koul: "This includes the cookie cleanup by Russell, the addition of context parameter for dmaengine APIs, more arm dmaengine driver cleanup by moving code to dmaengine, this time for imx by Javier and pl330 by Boojin along with the usual driver fixes." Fix up some fairly trivial conflicts with various other cleanups. * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (67 commits) dmaengine: imx: fix the build failure on x86_64 dmaengine: i.MX: Fix merge of cookie branch. dmaengine: i.MX: Add support for interleaved transfers. dmaengine: imx-dma: use 'dev_dbg' and 'dev_warn' for messages. dmaengine: imx-dma: remove 'imx_dmav1_baseaddr' and 'dma_clk'. dmaengine: imx-dma: remove unused arg of imxdma_sg_next. dmaengine: imx-dma: remove internal structure. dmaengine: imx-dma: remove 'resbytes' field of 'internal' structure. dmaengine: imx-dma: remove 'in_use' field of 'internal' structure. dmaengine: imx-dma: remove sg member from internal structure. dmaengine: imx-dma: remove 'imxdma_setup_sg_hw' function. dmaengine: imx-dma: remove 'imxdma_config_channel_hw' function. dmaengine: imx-dma: remove 'imxdma_setup_mem2mem_hw' function. dmaengine: imx-dma: remove dma_mode member of internal structure. dmaengine: imx-dma: remove data member from internal structure. dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c dmaengine: at_hdmac: add slave config operation dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic dmaengine/dma_slave: introduce inline wrappers dma: imx-sdma: Treat firmware messages as warnings instead of erros ...		2012-03-29 15:34:57 -07:00
..
dma-sh7760.c	ASoC: Convert sh directory to module_platform_driver	2011-11-25 13:15:29 +00:00
fsi-ak4642.c	ASoC: sh: Add .owner to struct snd_soc_card	2011-12-23 11:32:07 +00:00
fsi-da7210.c	ASoC: sh: Add .owner to struct snd_soc_card	2011-12-23 11:32:07 +00:00
fsi-hdmi.c	ASoC: sh: Add .owner to struct snd_soc_card	2011-12-23 11:32:07 +00:00
fsi.c	ASoC: fsi: Add DMAEngine support	2012-02-19 18:36:16 -08:00
hac.c	ASoC: Convert sh directory to module_platform_driver	2011-11-25 13:15:29 +00:00
Kconfig	ASoC: sh: fsi: modify improper dependent	2010-12-21 23:22:47 +00:00
Makefile	ASoC: fsi-codec: Add FSI - HDMI support	2010-09-01 11:18:09 +01:00
migor.c	ASoC: sh: Add .owner to struct snd_soc_card	2011-12-23 11:32:07 +00:00
sh7760-ac97.c	ASoC: sh: Add .owner to struct snd_soc_card	2011-12-23 11:32:07 +00:00
siu_dai.c	ASoC: Use core pm_runtime callbacks for siu_dai	2011-12-15 02:26:58 +08:00
siu_pcm.c	dmaengine/dma_slave: introduce inline wrappers	2012-03-21 19:20:22 +05:30
siu.h	ASoC: Do not include soc-dai.h	2010-11-22 14:04:53 +00:00
ssi.c	ASoC: Convert sh directory to module_platform_driver	2011-11-25 13:15:29 +00:00