mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
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.
|
||
|---|---|---|
| .. | ||
| include/mach | ||
| board-ag5evm.c | ||
| board-ap4evb.c | ||
| board-bonito.c | ||
| board-g3evm.c | ||
| board-g4evm.c | ||
| board-kota2.c | ||
| board-mackerel.c | ||
| board-marzen.c | ||
| clock-r8a7740.c | ||
| clock-r8a7779.c | ||
| clock-sh73a0.c | ||
| clock-sh7367.c | ||
| clock-sh7372.c | ||
| clock-sh7377.c | ||
| clock.c | ||
| console.c | ||
| cpuidle.c | ||
| entry-intc.S | ||
| headsmp.S | ||
| hotplug.c | ||
| intc-r8a7740.c | ||
| intc-r8a7779.c | ||
| intc-sh73a0.c | ||
| intc-sh7367.c | ||
| intc-sh7372.c | ||
| intc-sh7377.c | ||
| Kconfig | ||
| localtimer.c | ||
| Makefile | ||
| Makefile.boot | ||
| pfc-r8a7740.c | ||
| pfc-r8a7779.c | ||
| pfc-sh73a0.c | ||
| pfc-sh7367.c | ||
| pfc-sh7372.c | ||
| pfc-sh7377.c | ||
| platsmp.c | ||
| pm-r8a7779.c | ||
| pm-sh7372.c | ||
| setup-r8a7740.c | ||
| setup-r8a7779.c | ||
| setup-sh73a0.c | ||
| setup-sh7367.c | ||
| setup-sh7372.c | ||
| setup-sh7377.c | ||
| sleep-sh7372.S | ||
| smp-r8a7779.c | ||
| smp-sh73a0.c | ||
| suspend.c | ||
| timer.c | ||