mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 15:15:47 +00:00
Code Issues Releases Wiki Activity
linux-stable/sound/soc/imx
History
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
..
eukrea-tlv320.c ASoC: imx: rename audmux prefix mxc to imx 2012-03-06 00:03:04 +00:00
imx-audmux.c ARM: driver specific updates 2012-03-27 16:41:24 -07:00
imx-audmux.h ASoC: imx: rename audmux prefix mxc to imx 2012-03-06 00:03:04 +00:00
imx-pcm-dma-mx2.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-03-29 15:34:57 -07:00
imx-pcm-fiq.c ASoC: Add missed MODULE_LICENSE("GPL") for imx-pcm-fiq 2011-12-12 18:10:02 +08:00
imx-pcm.c ASoC: imx: separate imx-pcm bits from imx-ssi driver 2012-03-06 00:03:08 +00:00
imx-pcm.h ASoC: imx: separate imx-pcm bits from imx-ssi driver 2012-03-06 00:03:08 +00:00
imx-ssi.c Merge branch 'topic/asoc' into for-linus 2012-03-18 18:22:37 +01:00
imx-ssi.h ASoC: imx: separate imx-pcm bits from imx-ssi driver 2012-03-06 00:03:08 +00:00
Kconfig ASoC: imx: add an explicit Kconfig option for imx-ssi driver 2012-03-06 00:03:13 +00:00
Makefile ASoC: imx: add an explicit Kconfig option for imx-ssi driver 2012-03-06 00:03:13 +00:00
mx27vis-aic32x4.c ASoC: mx27vis-aic32x4: Convert it to platform driver 2012-03-13 23:09:59 +00:00
phycore-ac97.c ASoC: imx: rename audmux prefix mxc to imx 2012-03-06 00:03:04 +00:00
wm1133-ev1.c ASoC: imx: rename audmux prefix mxc to imx 2012-03-06 00:03:04 +00:00