You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds ca2a650f3d Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma ... Pull slave-dma updates from Vinod Koul: - new driver for BCM2835 used in R-pi - new driver for MOXA ART - dma_get_any_slave_channel API for DT based systems - minor fixes and updates spread acrooss driver [ The fsl-ssi dual fifo mode support addition clashed badly with the other changes to fsl-ssi that came in through the sound merge. I did a very rough cut at fixing up the conflict, but Nicolin Chen (author of both sides) will need to verify and check things ] * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (36 commits) dmaengine: mmp_pdma: fix mismerge dma: pl08x: Export pl08x_filter_id acpi-dma: align documentation with kernel-doc format dma: fix vchan_cookie_complete() debug print DMA: dmatest: extend the "device" module parameter to 32 characters drivers/dma: fix error return code dma: omap: Set debug level to debugging messages dmaengine: fix kernel-doc style typos for few comments dma: tegra: add support for Tegra148/124 dma: dw: use %pad instead of casting dma_addr_t dma: dw: join split up messages dma: dw: fix style of multiline comment dmaengine: k3dma: fix sparse warnings dma: pl330: Use dma_get_slave_channel() in the of xlate callback dma: pl330: Differentiate between submitted and issued descriptors dmaengine: sirf: Add device_slave_caps interface DMA: Freescale: change BWC from 256 bytes to 1024 bytes dmaengine: Add MOXA ART DMA engine driver dmaengine: Add DMA_PRIVATE to BCM2835 driver dma: imx-sdma: Assign a default script number for ROM firmware cases ...		11 years ago
..
bestcomm	drivers: clean-up prom.h implicit includes	12 years ago
dw	dma: dw: use %pad instead of casting dma_addr_t	11 years ago
ioat	drivers/dma/ioat/dma.c: check DMA mapping error in ioat_dma_self_test()	11 years ago
ipu	dmaengine: ipu: fix warnings from 64-bit dma_addr_t printouts	11 years ago
ppc4xx	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	11 years ago
sh	rcar-hpbdma: initialise plane information when halted	11 years ago
Kconfig	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	11 years ago
Makefile	dmaengine: Add MOXA ART DMA engine driver	11 years ago
TODO	…
acpi-dma.c	acpi-dma: align documentation with kernel-doc format	11 years ago
amba-pl08x.c	dma: pl08x: Export pl08x_filter_id	11 years ago
at_hdmac.c	Merge commit 'dmaengine-3.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine	11 years ago
at_hdmac_regs.h	dmaengine: at_hdmac: remove unused function	11 years ago
bcm2835-dma.c	dmaengine: Add DMA_PRIVATE to BCM2835 driver	11 years ago
coh901318.c	dmaengine: coh901318: use DMA_COMPLETE for dma completion status	11 years ago
coh901318.h	dma: coh901318: merge header files	12 years ago
coh901318_lli.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	12 years ago
cppi41.c	drivers/dma: fix error return code	11 years ago
dma-jz4740.c	dmaengine: jz4740: use DMA_COMPLETE for dma completion status	11 years ago
dmaengine.c	ARM: SoC cleanups for 3.14	11 years ago
dmaengine.h	…
dmatest.c	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	11 years ago
edma.c	dma: edma: Set debug level to debugging messages	11 years ago
ep93xx_dma.c	dmaengine: remove DMA unmap from drivers	11 years ago
fsldma.c	dma: fix fsldma build warnings	11 years ago
fsldma.h	DMA: Freescale: change BWC from 256 bytes to 1024 bytes	11 years ago
imx-dma.c	Merge branch 'for-linus' into next	11 years ago
imx-sdma.c	dma: imx-sdma: Assign a default script number for ROM firmware cases	11 years ago
intel_mid_dma.c	dmaengine: intel_mid_dma: use DMA_COMPLETE for dma completion status	11 years ago
intel_mid_dma_regs.h	dma: fix comments	13 years ago
iop-adma.c	Merge commit 'dmaengine-3.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine	11 years ago
iovlock.c	…
k3dma.c	dmaengine: k3dma: fix sparse warnings	11 years ago
mmp_pdma.c	dmaengine: mmp_pdma: fix mismerge	11 years ago
mmp_tdma.c	dma:mmp_tdma: get sram pool through device tree	11 years ago
moxart-dma.c	dmaengine: Add MOXA ART DMA engine driver	11 years ago
mpc512x_dma.c	drivers: clean-up prom.h implicit includes	12 years ago
mv_xor.c	dmaengine: mv_xor: fix oops when channels fail to initialise	11 years ago
mv_xor.h	dma: mv_xor: Fix mis-usage of mmio 'base' and 'high_base' registers	11 years ago
mxs-dma.c	dma: mxs-dma: Use semaphores for cyclic DMA	11 years ago
of-dma.c	dma: add channel request API that supports deferred probe	11 years ago
omap-dma.c	dma: omap: Set debug level to debugging messages	11 years ago
pch_dma.c	pch_dma: Add MODULE_DEVICE_TABLE	12 years ago
pl330.c	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	11 years ago
s3c24xx-dma.c	dma: fix build breakage in s3c24xx-dma	11 years ago
sa11x0-dma.c	dmaengine: sa11x0: use DMA_COMPLETE for dma completion status	11 years ago
sirf-dma.c	dmaengine: sirf: Add device_slave_caps interface	11 years ago
ste_dma40.c	dma: ste_dma40: Parse flags property for new 'high priority channel' request	11 years ago
ste_dma40_ll.c	dmaengine: ste_dma40_ll: Replace meaningless register set with comment	12 years ago
ste_dma40_ll.h	dmaengine: ste_dma40: Remove unnecessary call to d40_phy_cfg()	12 years ago
tegra20-apb-dma.c	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	11 years ago
timb_dma.c	dmaengine: remove DMA unmap from drivers	11 years ago
txx9dmac.c	dma: fix build warnings in txx9	11 years ago
txx9dmac.h	…
virt-dma.c	dmaengine: virt-dma: add support for cyclic DMA periodic callbacks	13 years ago
virt-dma.h	dma: fix vchan_cookie_complete() debug print	11 years ago