mirror of https://gitee.com/openkylin/linux.git
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.
|
||
|---|---|---|
| .. | ||
| devices | ||
| include/mach | ||
| 3ds_debugboard.c | ||
| Kconfig | ||
| Makefile | ||
| audmux-v1.c | ||
| audmux-v2.c | ||
| avic.c | ||
| clock.c | ||
| cpu.c | ||
| cpufreq.c | ||
| devices.c | ||
| epit.c | ||
| iomux-v1.c | ||
| iomux-v3.c | ||
| iram_alloc.c | ||
| irq-common.c | ||
| irq-common.h | ||
| pwm.c | ||
| ssi-fiq-ksym.c | ||
| ssi-fiq.S | ||
| system.c | ||
| time.c | ||
| tzic.c | ||
| ulpi.c | ||