5115f3c19d
Pull slave-dmaengine updates from Vinod Koul: "This is fairly big pull by my standards as I had missed last merge window. So we have the support for device tree for slave-dmaengine, large updates to dw_dmac driver from Andy for reusing on different architectures. Along with this we have fixes on bunch of the drivers" Fix up trivial conflicts, usually due to #include line movement next to each other. * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (111 commits) Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT" ARM: dts: pl330: Add #dma-cells for generic dma binding support DMA: PL330: Register the DMA controller with the generic DMA helpers DMA: PL330: Add xlate function DMA: PL330: Add new pl330 filter for DT case. dma: tegra20-apb-dma: remove unnecessary assignment edma: do not waste memory for dma_mask dma: coh901318: set residue only if dma is in progress dma: coh901318: avoid unbalanced locking dmaengine.h: remove redundant else keyword dma: of-dma: protect list write operation by spin_lock dmaengine: ste_dma40: do not remove descriptors for cyclic transfers dma: of-dma.c: fix memory leakage dw_dmac: apply default dma_mask if needed dmaengine: ioat - fix spare sparse complain dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c ioatdma: fix race between updating ioat->head and IOAT_COMPLETION_PENDING dw_dmac: add support for Lynxpoint DMA controllers dw_dmac: return proper residue value dw_dmac: fill individual length of descriptor ... |
||
---|---|---|
.. | ||
include/mach | ||
clock.c | ||
common.c | ||
common.h | ||
cpuidle.c | ||
crag6410.h | ||
dev-audio.c | ||
dev-uart.c | ||
dma.c | ||
irq-pm.c | ||
Kconfig | ||
mach-anw6410.c | ||
mach-crag6410-module.c | ||
mach-crag6410.c | ||
mach-hmt.c | ||
mach-mini6410.c | ||
mach-ncp.c | ||
mach-real6410.c | ||
mach-smartq5.c | ||
mach-smartq7.c | ||
mach-smartq.c | ||
mach-smartq.h | ||
mach-smdk6400.c | ||
mach-smdk6410.c | ||
Makefile | ||
Makefile.boot | ||
pm.c | ||
regs-gpio-memport.h | ||
regs-modem.h | ||
regs-srom.h | ||
regs-sys.h | ||
regs-syscon-power.h | ||
s3c6400.c | ||
s3c6410.c | ||
setup-fb-24bpp.c | ||
setup-i2c0.c | ||
setup-i2c1.c | ||
setup-ide.c | ||
setup-keypad.c | ||
setup-sdhci-gpio.c | ||
setup-spi.c | ||
setup-usb-phy.c | ||
sleep.S |