lkml.org 
[lkml]   [2012]   [Dec]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Subject[GIT PULL] dmaengine updates
From
Date
Hi Linus,

This is the pull request for dmaengine. I just saw that you have declared rc1
couple of hours ago, so I missed the window narrowly... I can try to make an
excuse that I am vacation and was traveling so this got delayed. And was
counting on your Christmas deadline :(

Please do consider merging this for rc2 as it brings in much awaited DT support for
dmaengine which lot of folks care about and have plans to work on it for next
release. Along with this add few other odd fixes including ones on async_tx

are available in the git repository at:

git://git.infradead.org/users/vkoul/slave-dma.git next

Akinobu Mita (4):
dmaengine: use for_each_set_bit
dma: amba-pl08x: use vchan_dma_desc_free_list
dmatest: adjust invalid module parameters for number of source buffers
async_tx: use memchr_inv

Andy Shevchenko (4):
dw_dmac: change dev_printk() to corresponding macros
dw_dmac: don't call platform_get_drvdata twice
dw_dmac: change dev_crit to dev_WARN in dwc_handle_error
dw_dmac: introduce to_dw_desc() macro

Barry Song (2):
dmaengine: sirf: enable the driver support new SiRFmarco SoC
DMAEngine: add dmaengine_prep_interleaved_dma wrapper for interleaved api

Bartlomiej Zolnierkiewicz (10):
async_tx: add missing DMA unmap to async_memcpy()
ioat: add missing DMA unmap to ioat_dma_self_test()
mtd: fsmc_nand: add missing DMA unmap to dma_xfer()
carma-fpga: pass correct flags to ->device_prep_dma_memcpy()
ioat3: add missing DMA unmap to ioat_xor_val_self_test()
async_tx: fix build for async_memset
dmaengine: remove dma_async_memcpy_pending() macro
dmaengine: remove dma_async_memcpy_complete() macro
dmaengine: add cpu_relax() to busy-loop in dma_sync_wait()
async_tx: fix checking of dma_wait_for_async_tx() return value

Dave Jiang (2):
ioat: Add alignment workaround for IVB platforms
ioat: remove chanerr mask setting for IOAT v3.x

Guennadi Liakhovetski (1):
dma: sh: Don't use ENODEV for failing slave lookup

Heikki Krogerus (2):
dmaengine: dw_dmac: remove CLK dependency
dmaengine: dw_dmac: amend description and indentation

Jean Delvare (1):
dma: ipu: Drop unused spinlock

Joe Perches (1):
dma: Convert dev_printk(KERN_<LEVEL> to dev_<level>(

Jon Hunter (4):
dmaengine: add helper function to request a slave DMA channel
of: Add generic device tree DMA helpers
of: dma: fix potential deadlock when requesting a slave channel
of: dma: fix protection of DMA controller data stored by DMA helpers

Jon Mason (1):
dmatest: Fix NULL pointer dereference on ioat

Kees Cook (1):
drivers/dma: remove CONFIG_EXPERIMENTAL

Maciej Sosnowski (1):
dca: check against empty dca_domains list before unregister provider

Matt Porter (1):
of: dma: fix typos in generic dma binding definition

Sachin Kamat (1):
DMA: PL330: Use devm_* functions

Shiraz Hashim (1):
dmaengine/dmatest: terminate transfers only in case of errors

Vinod Koul (5):
of: dma- fix build break for !CONFIG_OF
dmaengine: fix build failure due to missing semi-colon
Merge branch 'topic/dmaengine_dt' into next
dmaengine: fix !of_dma compilation warning
Merge git://git.kernel.org/.../djbw/dmaengine.git/next

Viresh Kumar (3):
dmaengine: dw_dmac: Update documentation style comments for dw_dma_platform_data
dmaengine: dw_dmac: Enhance device tree support
ARM: SPEAr13xx: Pass DW DMAC platform data from DT

Wei Yongjun (1):
pch_dma: use module_pci_driver to simplify the code

Documentation/devicetree/bindings/dma/dma.txt | 81 ++++++
Documentation/devicetree/bindings/dma/snps-dma.txt | 44 ++++
arch/arm/boot/dts/spear1340.dtsi | 19 ++
arch/arm/boot/dts/spear13xx.dtsi | 38 +++
arch/arm/mach-spear13xx/include/mach/spear.h | 2 -
arch/arm/mach-spear13xx/spear1310.c | 4 +-
arch/arm/mach-spear13xx/spear1340.c | 27 +--
arch/arm/mach-spear13xx/spear13xx.c | 54 +----
crypto/async_tx/async_memcpy.c | 6 +
crypto/async_tx/async_memset.c | 1 +
crypto/async_tx/async_tx.c | 9 +-
crypto/async_tx/async_xor.c | 4 +-
drivers/dca/dca-core.c | 5 +
drivers/dma/Kconfig | 7 +-
drivers/dma/amba-pl08x.c | 8 +-
drivers/dma/at_hdmac_regs.h | 8 +-
drivers/dma/dmaengine.c | 21 ++-
drivers/dma/dmatest.c | 22 ++-
drivers/dma/dw_dmac.c | 167 +++++++++++--
drivers/dma/dw_dmac_regs.h | 6 +
drivers/dma/ioat/dma.c | 11 +-
drivers/dma/ioat/dma_v3.c | 105 ++++++--
drivers/dma/ioat/hw.h | 11 +
drivers/dma/ioat/pci.c | 11 -
drivers/dma/iop-adma.c | 45 ++--
drivers/dma/ipu/ipu_irq.c | 1 -
drivers/dma/mv_xor.c | 62 ++---
drivers/dma/pch_dma.c | 13 +-
drivers/dma/pl330.c | 37 +--
drivers/dma/sh/shdma.c | 2 +-
drivers/dma/sirf-dma.c | 25 ++-
drivers/misc/carma/carma-fpga-program.c | 2 +-
drivers/misc/carma/carma-fpga.c | 6 +-
drivers/mtd/nand/fsmc_nand.c | 22 +-
drivers/of/Makefile | 2 +-
drivers/of/dma.c | 264 ++++++++++++++++++++
include/linux/dmaengine.h | 43 ++--
include/linux/dw_dmac.h | 45 ++--
include/linux/of_dma.h | 74 ++++++
net/ipv4/tcp.c | 8 +-
40 files changed, 995 insertions(+), 327 deletions(-)
create mode 100644 Documentation/devicetree/bindings/dma/dma.txt
create mode 100644 drivers/of/dma.c
create mode 100644 include/linux/of_dma.h

--
Vinod Koul
Intel Corp.
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-12-22 06:21    [W:0.080 / U:0.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site