Linus Torvalds 57f2685c16 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ...

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)
  ARM: mach-shmobile: specify CHCLR registers on SH7372
  dma: shdma: fix runtime PM: clear channel buffers on reset
  dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit
  dmaengine/ste_dma40: clear LNK on channel startup
  dmaengine: intel_mid_dma: remove legacy pm interface
  ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
  dmaengine: intel_mid_dma: error path fix
  dmaengine: intel_mid_dma: locking and freeing fixes
  mtd: gpmi-nand: move to dma_transfer_direction
  mtd: fix compile error for gpmi-nand
  mmc: mxs-mmc: fix the dma_transfer_direction migration
  dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
  dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels
  dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe
  dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.
  dma: mxs-dma: fix a typo in comment
  DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove
  video i.MX IPU: Fix display connections
  i.MX IPU DMA: Fix wrong burstsize settings
  dmaengine/ste_dma40: allow fixed physical channel
  ...

Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}

The conflicts looked pretty trivial, but I'll ask people to verify them.

2012-01-17 18:40:24 -08:00

..

ioat

ioat: fix xor_idx_to_desc

2011-08-03 22:25:06 -07:00

ipu

i.MX IPU DMA: Fix wrong burstsize settings

2011-12-08 12:59:03 +05:30

ppc4xx

Merge branch 'old_next' into next

2011-04-06 11:51:12 +05:30

amba-pl08x.c

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2012-01-17 18:40:24 -08:00

at_hdmac_regs.h

dmaengine: at_hdmac: simplify device selection from platform data or DT

2011-11-28 15:55:36 +05:30

at_hdmac.c

dmaengine: at_hdmac: simplify device selection from platform data or DT

2011-11-28 15:55:36 +05:30

coh901318_lli.c

dmaengine: move drivers to dma_transfer_direction

2011-10-27 20:53:43 +05:30

coh901318_lli.h

dmaengine: move drivers to dma_transfer_direction

2011-10-27 20:53:43 +05:30

coh901318.c

dmaengine: move drivers to dma_transfer_direction

2011-10-27 20:53:43 +05:30

dmaengine.c

DMAEngine: Define interleaved transfer request api

2011-11-18 12:16:24 +05:30

dmatest.c

dmatest: don't use set_freezable_with_signal()

2011-11-23 09:28:16 -08:00

dw_dmac_regs.h

dmaengine/dw_dmac: Reconfigure interrupt and chan_cfg register on resume

2011-11-28 08:48:02 +05:30

dw_dmac.c

dmaengine/dw_dmac: Reconfigure interrupt and chan_cfg register on resume

2011-11-28 08:48:02 +05:30

ep93xx_dma.c

dma/ep93xx_dma: prevent ep93xx_dma_tasklet() to reference an empty list

2011-12-05 08:16:26 +05:30

fsldma.c

dmaengine: move drivers to dma_transfer_direction

2011-10-27 20:53:43 +05:30

fsldma.h

fsldma: fix controller lockups

2011-03-11 17:52:36 -08:00

imx-dma.c

Merge branch 'dma_slave_direction' into next_test_dirn

2011-11-17 14:54:57 +05:30

imx-sdma.c

dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit

2012-01-06 11:31:56 +05:30

intel_mid_dma_regs.h

dmaengine: intel_mid_dma: remove legacy pm interface

2012-01-02 16:34:42 +05:30

intel_mid_dma.c

dmaengine: intel_mid_dma: remove legacy pm interface

2012-01-02 16:34:42 +05:30

iop-adma.c

dmaengine: convert drivers/dma/* to use module_platform_driver()

2011-12-05 08:25:54 +05:30

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

dma: MX3_IPU fix depends

2011-12-19 12:26:07 +01:00

Makefile

dmaengine: add CSR SiRFprimaII DMAC driver

2011-11-18 12:25:22 +05:30

mpc512x_dma.c

dmaengine: convert drivers/dma/* to use module_platform_driver()

2011-12-05 08:25:54 +05:30

mv_xor.c

ARM: Orion: Get address map from plat-orion instead of via platform_data

2011-12-13 18:46:55 -05:00

mv_xor.h

mv_xor: implement a private tx_list

2009-09-08 17:53:03 -07:00

mxs-dma.c

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2012-01-17 18:40:24 -08:00

pch_dma.c

Merge branch 'dma_slave_direction' into next_test_dirn

2011-11-17 14:54:57 +05:30

pl330.c

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2012-01-17 18:40:24 -08:00

shdma.c

dma: shdma: fix runtime PM: clear channel buffers on reset

2012-01-06 11:40:11 +05:30

shdma.h

dma: shdma: transfer based runtime PM

2011-09-28 10:07:40 +05:30

sirf-dma.c

dmaengine: convert drivers/dma/* to use module_platform_driver()

2011-12-05 08:25:54 +05:30

ste_dma40_ll.c

dma40: cyclic xfer support

2011-01-30 22:27:21 -08:00

ste_dma40_ll.h

dmaengine/ste_dma40: support pm in dma40

2011-11-22 09:46:06 +05:30

ste_dma40.c

dmaengine/ste_dma40: clear LNK on channel startup

2012-01-02 16:42:44 +05:30

timb_dma.c

dmaengine: convert drivers/dma/* to use module_platform_driver()

2011-12-05 08:25:54 +05:30

TODO

dmaengine: remove ste_dma40 from issue_pending TODO

2011-07-14 04:02:08 +05:30

txx9dmac.c

dmaengine: move drivers to dma_transfer_direction

2011-10-27 20:53:43 +05:30

txx9dmac.h

txx9dmac: implement a private tx_list

2009-09-08 17:53:03 -07:00