57f2685c16
* '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.
|
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| am35x.c | ||
| blackfin.c | ||
| blackfin.h | ||
| cppi_dma.c | ||
| cppi_dma.h | ||
| da8xx.c | ||
| davinci.c | ||
| davinci.h | ||
| musb_core.c | ||
| musb_core.h | ||
| musb_debug.h | ||
| musb_debugfs.c | ||
| musb_dma.h | ||
| musb_gadget.c | ||
| musb_gadget.h | ||
| musb_gadget_ep0.c | ||
| musb_host.c | ||
| musb_host.h | ||
| musb_io.h | ||
| musb_regs.h | ||
| musb_virthub.c | ||
| musbhsdma.c | ||
| musbhsdma.h | ||
| omap2430.c | ||
| omap2430.h | ||
| tusb6010.c | ||
| tusb6010.h | ||
| tusb6010_omap.c | ||
| ux500.c | ||
| ux500_dma.c | ||