mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-31 22:15:38 +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.
|
||
|---|---|---|
| .. | ||
| gpmi-nand | ||
| alauda.c | ||
| ams-delta.c | ||
| atmel_nand_ecc.h | ||
| atmel_nand.c | ||
| au1550nd.c | ||
| autcpu12.c | ||
| bcm_umi_bch.c | ||
| bcm_umi_nand.c | ||
| bf5xx_nand.c | ||
| cafe_nand.c | ||
| cmx270_nand.c | ||
| cs553x_nand.c | ||
| davinci_nand.c | ||
| denali.c | ||
| denali.h | ||
| diskonchip.c | ||
| fsl_elbc_nand.c | ||
| fsl_upm.c | ||
| fsmc_nand.c | ||
| gpio.c | ||
| h1910.c | ||
| jz4740_nand.c | ||
| Kconfig | ||
| Makefile | ||
| mpc5121_nfc.c | ||
| mxc_nand.c | ||
| nand_base.c | ||
| nand_bbt.c | ||
| nand_bch.c | ||
| nand_bcm_umi.c | ||
| nand_bcm_umi.h | ||
| nand_ecc.c | ||
| nand_ids.c | ||
| nandsim.c | ||
| ndfc.c | ||
| nomadik_nand.c | ||
| nuc900_nand.c | ||
| omap2.c | ||
| orion_nand.c | ||
| pasemi_nand.c | ||
| plat_nand.c | ||
| ppchameleonevb.c | ||
| pxa3xx_nand.c | ||
| r852.c | ||
| r852.h | ||
| rtc_from4.c | ||
| s3c2410.c | ||
| sh_flctl.c | ||
| sharpsl.c | ||
| sm_common.c | ||
| sm_common.h | ||
| socrates_nand.c | ||
| spia.c | ||
| tmio_nand.c | ||
| txx9ndfmc.c | ||