* [GIT PULL] slave-dmaengine updates
@ 2013-11-20 3:46 Vinod Koul
0 siblings, 0 replies; 12+ messages in thread
From: Vinod Koul @ 2013-11-20 3:46 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Dan Williams, LKML, vinod.koul, dma
[-- Attachment #1: Type: text/plain, Size: 12616 bytes --]
Hi Linus
Here is the pull request for 3.13. This is consolidated pull request from Dan
Williams and me. I have merged his changes into mine.
This brings for slave dmaengine:
- Change dma notification flag to DMA_COMPLETE from DMA_SUCCESS as dmaengine can
only transfer and not verify validaty of dma transfers
- Bunch of fixes across drivers:
- cppi41 driver fixes from Daniel
- 8 channel freescale dma engine support and updated bindings from Hongbo
- msx-dma fixes and cleanup by Markus
- DMAengine updates from Dan:
1/ Bartlomiej and Dan finalized a rework of the dma address unmap
implementation.
2/ In the course of testing 1/ a collection of enhancements to dmatest
fell out. Notably basic performance statistics, and fixed / enhanced
test control through new module parameters 'run', 'wait', 'noverify',
and 'verbose'. Thanks to Andriy and Linus for their review.
3/ Testing the raid related corner cases of 1/ triggered bugs in the
recently added 16-source operation support in the ioatdma driver.
4/ Some minor fixes / cleanups to mv_xor and ioatdma.
--
Thanks
~Vinod
The following changes since commit 959f58544b7f20c92d5eb43d1232c96c15c01bfb:
Linus Torvalds (1):
Linux 3.12-rc7
are available in the git repository at:
git://git.infradead.org/users/vkoul/slave-dma.git next
Bartlomiej Zolnierkiewicz (4):
dmatest: make driver unmap also source buffers by itself
NTB: convert to dmaengine_unmap_data
dmaengine: remove DMA unmap from drivers
dmaengine: remove DMA unmap flags
Dan Carpenter (2):
dma: pl330: off by one in pl330_probe()
dma: pl330: silence a compile warning
Dan Williams (26):
dmaengine: consolidate memcpy apis
dmaengine: prepare for generic 'unmap' data
dmaengine: reference counted unmap data
async_memcpy: convert to dmaengine_unmap_data
async_xor: convert to dmaengine_unmap_data
async_xor_val: convert to dmaengine_unmap_data
async_raid6_recov: convert to dmaengine_unmap_data
async_pq: convert to dmaengine_unmap_data
async_pq_val: convert to dmaengine_unmap_data
Revert "dmatest: append verify result to results"
dmatest: replace stored results mechanism, with uniform messages
dmatest: cleanup redundant "dmatest: " prefixes
dmatest: restore ability to start test at module load and init
dmatest: support xor-only, or pq-only channels in tests
dmatest: use pseudo random numbers
dmatest: add support for skipping verification and random data setup
dmatest: add basic performance metrics
dmatest: add a 'wait' parameter
dmatest: convert to dmaengine_unmap_data
dmatest: verbose mode
ioatdma: fix sed pool selection
ioatdma: fix selection of 16 vs 8 source path
ioatdma: clean up sed pool kmem_cache
raid6test: add new corner case for ioatdma driver
ioat: kill msix_single_vector support
ioat: fix ioat3_irq_reinit
Daniel Mack (6):
dma: cppi41: pass around device instead of platform_device
dma: cppi41: s/deinit_cpii41/deinit_cppi41/
dma: cppi41: add shortcut to &pdev->dev in cppi41_dma_probe()
dma: cppi41: add support for suspend and resume
dma: cppi41: restore more registers
dma: cppi41: use cppi41_pop_desc() where possible
Dave Jiang (1):
ioatdma: Fix bug in selftest after removal of DMA_MEMSET.
Ezequiel Garcia (2):
dma: mv_xor: Remove unneeded NULL address check
dma: mv_xor: Fix mis-usage of mmio 'base' and 'high_base' registers
Guennadi Liakhovetski (1):
DMA: ste_dma40: use a power of 2 check
Hongbo Zhang (3):
DMA: Freescale: revise device tree binding document
DMA: Freescale: Add new 8-channel DMA engine device tree nodes
DMA: Freescale: update driver to support 8-channel DMA engine
Joel Fernandes (3):
dma: edma: Split out PaRAM set calculations into its own function
dma: edma: Increase maximum SG limit to 20
dma: edma: Add support for Cyclic DMA
Ludovic Desroches (1):
dma: atmel-dma: correct typo in the device tree bindings documentation
Markus Pargmann (5):
dma: mxs-dma: Cleanup interrupt handler
dma: mxs-dma: Report correct residue for cyclic DMA
dma: mxs-dma: Fix channel reset hardware bug
dma: mxs-dma: Update state after channel reset
dma: mxs-dma: Use semaphores for cyclic DMA
Michael Opdenacker (2):
dma: coh901318: remove deprecated IRQF_DISABLED
dma: misc: remove deprecated IRQF_DISABLED
Michal Simek (3):
dma: pl330: Simplify irq allocation
dma: pl330: Support per channel irq allocation
dma: pl330: Remove unnecessary amba_set_drvdata()
Olof Johansson (2):
dmaengine: ipu: fix warnings from 64-bit dma_addr_t printouts
dma: imx-sdma: Fix warnings for LPAE builds
Qiao Zhou (1):
dma: mmp_tdma: add multiple burst size support for 910-squ
Russell King (1):
dmaengine: imx-dma: fix format warnings
Sachin Kamat (1):
dma: tegra20-apb-dma: Staticize tegra_dma_prep_dma_cyclic
Sebastian Andrzej Siewior (3):
fix missing edma changes to EDMA_DMA_COMPLETE status
dma: cppi41: redo descriptor collection in abort case
dma: cppi41: return code > 0 of pm_runtime_get_sync() is not an error
Vinod Koul (36):
dmaengine: use DMA_COMPLETE for dma completion status
dmaengine: amba-pl08x: use DMA_COMPLETE for dma completion status
dmaengine: at_hdma: use DMA_COMPLETE for dma completion status
dmaengine: coh901318: use DMA_COMPLETE for dma completion status
dmaengine: cppi41: use DMA_COMPLETE for dma completion status
dmaengine: jz4740: use DMA_COMPLETE for dma completion status
dmaengine: dmatest: use DMA_COMPLETE for dma completion status
dmaengine: dw: use DMA_COMPLETE for dma completion status
dmaengine: edma: use DMA_COMPLETE for dma completion status
dmaengine: imx-dma: use DMA_COMPLETE for dma completion status
dmaengine: imx-sdma: use DMA_COMPLETE for dma completion status
dmaengine: intel_mid_dma: use DMA_COMPLETE for dma completion status
dmaengine: ioat: use DMA_COMPLETE for dma completion status
dmaengine: iop: use DMA_COMPLETE for dma completion status
dmaengine: k3dma: use DMA_COMPLETE for dma completion status
dmaengine: mmp_tdma: use DMA_COMPLETE for dma completion status
dmaengine: mv_xor: use DMA_COMPLETE for dma completion status
dmaengine: mxs-dma: use DMA_COMPLETE for dma completion status
dmaengine: omap: use DMA_COMPLETE for dma completion status
dmaengine: ppc4xx: use DMA_COMPLETE for dma completion status
dmaengine: sa11x0: use DMA_COMPLETE for dma completion status
dmaengine: sh: use DMA_COMPLETE for dma completion status
dmaengine: ste: use DMA_COMPLETE for dma completion status
dmaengine: tegra: use DMA_COMPLETE for dma completion status
dmaengine: txx9: use DMA_COMPLETE for dma completion status
async_tx: use DMA_COMPLETE for dma completion status
serial: sh: use DMA_COMPLETE for dma completion status
net: use DMA_COMPLETE for dma completion status
dmaengine: remove unused DMA_SUCCESS
Merge branch 'for-linus' into next
Merge branch 'dma_complete' into next
dmanengine: fix edma driver to not define DMA_COMPLETE
Merge branch 'dma_complete' into next
Merge branch 'for-linus' into next
dmaengine: edma: remove duplicate kfree
Merge commit 'dmaengine-3.13-v2' of git://git.kernel.org/.../djbw/dmaengine
Wei Yongjun (1):
dma: mmp_pdma: use list_move instead of list_del/list_add
.../devicetree/bindings/dma/atmel-dma.txt | 2 +-
.../devicetree/bindings/powerpc/fsl/dma.txt | 138 +++-
Documentation/dmatest.txt | 72 +-
arch/arm/common/edma.c | 4 +-
arch/arm/include/asm/hardware/iop3xx-adma.h | 30 -
arch/arm/include/asm/hardware/iop_adma.h | 4 -
arch/arm/mach-iop13xx/include/mach/adma.h | 26 -
arch/powerpc/boot/dts/fsl/b4si-post.dtsi | 4 +-
arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 82 ++
arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 82 ++
arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 +-
crypto/async_tx/async_memcpy.c | 37 +-
crypto/async_tx/async_pq.c | 174 +++--
crypto/async_tx/async_raid6_recov.c | 61 +-
crypto/async_tx/async_tx.c | 4 +-
crypto/async_tx/async_xor.c | 123 ++--
crypto/async_tx/raid6test.c | 10 +-
drivers/ata/pata_arasan_cf.c | 3 +-
drivers/dma/Kconfig | 9 +-
drivers/dma/amba-pl08x.c | 39 +-
drivers/dma/at_hdmac.c | 28 +-
drivers/dma/coh901318.c | 4 +-
drivers/dma/cppi41.c | 178 +++--
drivers/dma/dma-jz4740.c | 2 +-
drivers/dma/dmaengine.c | 264 ++++--
drivers/dma/dmatest.c | 917 ++++++++------------
drivers/dma/dw/core.c | 29 +-
drivers/dma/edma.c | 369 ++++++--
drivers/dma/ep93xx_dma.c | 30 +-
drivers/dma/fsldma.c | 26 +-
drivers/dma/fsldma.h | 2 +-
drivers/dma/imx-dma.c | 42 +-
drivers/dma/imx-sdma.c | 10 +-
drivers/dma/intel_mid_dma.c | 4 +-
drivers/dma/ioat/dma.c | 53 +-
drivers/dma/ioat/dma.h | 14 -
drivers/dma/ioat/dma_v2.c | 2 +-
drivers/dma/ioat/dma_v2.h | 1 -
drivers/dma/ioat/dma_v3.c | 323 +------
drivers/dma/ioat/pci.c | 20 +-
drivers/dma/iop-adma.c | 113 +---
drivers/dma/ipu/ipu_idmac.c | 6 +-
drivers/dma/k3dma.c | 4 +-
drivers/dma/mmp_pdma.c | 7 +-
drivers/dma/mmp_tdma.c | 40 +-
drivers/dma/mv_xor.c | 58 +--
drivers/dma/mv_xor.h | 25 +-
drivers/dma/mxs-dma.c | 178 +++-
drivers/dma/omap-dma.c | 2 +-
drivers/dma/pl330.c | 32 +-
drivers/dma/ppc4xx/adma.c | 272 +------
drivers/dma/sa11x0-dma.c | 2 +-
drivers/dma/sh/shdma-base.c | 2 +-
drivers/dma/sh/shdmac.c | 4 +-
drivers/dma/ste_dma40.c | 7 +-
drivers/dma/tegra20-apb-dma.c | 6 +-
drivers/dma/timb_dma.c | 37 +-
drivers/dma/txx9dmac.c | 29 +-
drivers/media/platform/m2m-deinterlace.c | 3 +-
drivers/media/platform/timblogiw.c | 2 +-
drivers/misc/carma/carma-fpga.c | 3 +-
drivers/mtd/nand/atmel_nand.c | 3 +-
drivers/mtd/nand/fsmc_nand.c | 2 -
drivers/net/ethernet/micrel/ks8842.c | 6 +-
drivers/ntb/ntb_transport.c | 86 ++-
drivers/spi/spi-dw-mid.c | 4 +-
drivers/tty/serial/sh-sci.c | 2 +-
include/linux/dmaengine.h | 76 ++-
include/linux/platform_data/edma.h | 8 +-
net/ipv4/tcp.c | 4 +-
sound/soc/davinci/davinci-pcm.c | 2 +-
71 files changed, 1979 insertions(+), 2272 deletions(-)
create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi
create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi
--
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL] slave-dmaengine updates
@ 2014-04-09 16:12 Vinod Koul
0 siblings, 0 replies; 12+ messages in thread
From: Vinod Koul @ 2014-04-09 16:12 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Dan Williams, LKML, dma
[-- Attachment #1: Type: text/plain, Size: 5578 bytes --]
Hey Linus,
Here is the pull request for this merge window. Please pull to receive:
- New driver for Qcom bam dma
- New driver for RCAR peri-peri
- New driver for FSL eDMA
- Various odd fixes and updates thru the subsystem
The following changes since commit b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed:
Linus Torvalds (1):
Linux 3.14-rc2
are available in the git repository at:
git://git.infradead.org/users/vkoul/slave-dma.git for-linus
Alexander Shiyan (2):
dma: imx-dma: Replace printk with dev_*
dma: imx-dma: Add missing module owner field
Andy Gross (2):
dmaengine: qcom_bam_dma: Add device tree binding
dmaengine: add Qualcomm BAM dma driver
Andy Shevchenko (5):
acpi-dma: use devm_release() instead of devm_destroy()
acpi-dma: convert to return error code when asked for channel
dma: dw: add a PCI ID for Intel Haswell SoC
dma: dw: remove leftovers in the comment blocks
dma: dw: allocate memory in two stages in probe
Barry Song (1):
dmaengine: sirf: enable generic dt binding for dma channels
Chao Xie (1):
dma: mmp_pdma: add IRQF_SHARED when request irq
Chew, Chiau Ee (1):
dma: dw: Add suspend and resume handling for PCI mode DW_DMAC.
Christian Engelmayer (1):
dma: edma: Fix memory leak in edma_prep_dma_cyclic()
Dan Carpenter (1):
dmaengine: s3c24xx-dma: make phy->irq signed for error handling
George Cherian (2):
usb: musb: musb_cppi41: Dont reprogram DMA if tear down is initiated
dma: cppi41: start tear down only if channel is busy
Jerome Blin (1):
Add new line to test result strings produced in verbose mode
Jingchang Lu (2):
dma: Add Freescale eDMA engine driver support
dma: fsl-edma: fix static checker warning of NULL dereference
Kuninori Morimoto (1):
shdma: add R-Car Audio DMAC peri peri driver
Lars-Peter Clausen (1):
dma: Remove comment about embedding dma_slave_config into custom structs
Laurent Pinchart (3):
DMA: shdma: Fix warnings due to improper casts and printk formats
DMA: shdma: Fix warnings due to declared but unused symbols
DMA: shdma: Make sh_dmae_pm static
Nenghua Cao (1):
dma: mmp_tdma: move to generic device tree binding
Paul Bolle (1):
dmaengine: Remove dependency on MACH_BCM2708
Peter Ujfalusi (1):
dma: omap-dma: Implement device_slave_caps callback
Vinod Koul (4):
dmaengine: at_hdmac: use tasklet_kill in teardown
dmaengine: pch_dma: use tasklet_kill in teardown
Merge branch 'topic/tasklet_fix' into for-linus
Merge branch 'topic/bam' into for-linus
Documentation/devicetree/bindings/dma/fsl-edma.txt | 76 ++
.../devicetree/bindings/dma/qcom_bam_dma.txt | 41 +
.../devicetree/bindings/dma/sirfsoc-dma.txt | 43 +
arch/arm/boot/dts/atlas6.dtsi | 2 +
arch/arm/boot/dts/prima2.dtsi | 2 +
drivers/dma/Kconfig | 21 +-
drivers/dma/Makefile | 2 +
drivers/dma/acpi-dma.c | 17 +-
drivers/dma/at_hdmac.c | 1 -
drivers/dma/cppi41.c | 7 +-
drivers/dma/dmaengine.c | 9 +-
drivers/dma/dmatest.c | 4 +-
drivers/dma/dw/core.c | 21 +-
drivers/dma/dw/pci.c | 36 +
drivers/dma/dw/regs.h | 4 +-
drivers/dma/edma.c | 5 +-
drivers/dma/fsl-edma.c | 975 +++++++++++++++++
drivers/dma/imx-dma.c | 13 +-
drivers/dma/mmp_pdma.c | 8 +-
drivers/dma/mmp_tdma.c | 50 +
drivers/dma/omap-dma.c | 18 +
drivers/dma/pch_dma.c | 4 +-
drivers/dma/qcom_bam_dma.c | 1111 ++++++++++++++++++++
drivers/dma/s3c24xx-dma.c | 2 +-
drivers/dma/sh/Kconfig | 6 +
drivers/dma/sh/Makefile | 1 +
drivers/dma/sh/rcar-audmapp.c | 320 ++++++
drivers/dma/sh/shdma-base.c | 10 +-
drivers/dma/sh/shdma-of.c | 3 +-
drivers/dma/sh/shdmac.c | 13 +-
drivers/dma/sh/sudmac.c | 4 +-
drivers/dma/sirf-dma.c | 23 +
drivers/usb/musb/musb_cppi41.c | 3 +-
include/linux/acpi_dma.h | 5 +-
include/linux/dmaengine.h | 14 +-
include/linux/dw_dmac.h | 5 +-
include/linux/platform_data/dma-rcar-audmapp.h | 34 +
37 files changed, 2839 insertions(+), 74 deletions(-)
create mode 100644 Documentation/devicetree/bindings/dma/fsl-edma.txt
create mode 100644 Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
create mode 100644 Documentation/devicetree/bindings/dma/sirfsoc-dma.txt
create mode 100644 drivers/dma/fsl-edma.c
create mode 100644 drivers/dma/qcom_bam_dma.c
create mode 100644 drivers/dma/sh/rcar-audmapp.c
create mode 100644 include/linux/platform_data/dma-rcar-audmapp.h
Thanks
--
~Vinod
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL] slave-dmaengine updates
@ 2013-07-07 4:17 Vinod Koul
2013-07-07 21:39 ` Linus Torvalds
0 siblings, 1 reply; 12+ messages in thread
From: Vinod Koul @ 2013-07-07 4:17 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, Dan Williams, Vinod Koul
[-- Attachment #1: Type: text/plain, Size: 7273 bytes --]
Hi Linus,
Once you have some time from extended weekend celebrations please consider
pulling the following to get:
- Various fixes and PCI driver for dw_dmac by Andy
- DT binding for imx-dma by Markus & imx-sdma by Shawn
- DT fixes for dmaengine by Lars
- jz4740 dmac driver by Lars
- and various fixes across the drivers
The following changes since commit 317ddd256b9c24b0d78fa8018f80f1e495481a10:
Linus Torvalds (1):
Linux 3.10-rc5
are available in the git repository at:
git://git.infradead.org/users/vkoul/slave-dma.git for-linus
Andy Shevchenko (4):
dw_dmac: don't check resource with devm_ioremap_resource
dma: move dw_dmac driver to an own directory
dma: dw: split driver to library part and platform code
dma: dw: add PCI part of the driver
Boris BREZILLON (1):
dmaengine: at_hdmac: prepare clk before calling enable
Denis Efremov (1):
dw_dmac: remove inline marking of EXPORT_SYMBOL functions
Dmitry Osipenko (2):
dma: tegra20-apbdma: err message correction
dma: tegra: avoid channel lock up after free
Elen Song (2):
DMA: AT91: Get transfer width
DMA: AT91: Get residual bytes in dma buffer
Fabio Estevam (1):
dma: mxs-dma: Staticize mxs_dma_xlate
Guennadi Liakhovetski (3):
DMA: shdma: (cosmetic) don't re-calculate a pointer
DMA: shdma: shdma_chan_filter() has to be in shdma-base.h
DMA: shdma: add DT support
Jingoo Han (3):
dma: use platform_{get,set}_drvdata()
dma: at_hdmac: remove unnecessary platform_set_drvdata()
dma: timb_dma: remove unnecessary platform_set_drvdata()
Lars-Peter Clausen (5):
dma: of: Remove restriction that #dma-cells can't be 0
dma: of: Remove check on always true condition
dma: Add a jz4740 dmaengine driver
MIPS: jz4740: Register jz4740 DMA device
MIPS: jz4740: Remove custom DMA API
Ludovic Desroches (2):
ARM: at91: dt: add header to define at_hdmac configuration
dmaengine: at_hdmac: add FIFO configuration parameter to DMA DT binding
Maarten ter Huurne (2):
MIPS: jz4740: Acquire and enable DMA controller clock
MIPS: jz4740: Correct clock gate bit for DMA controller
Mark Brown (1):
dmaengine: PL08x: Avoid collisions with get_signal() macro
Markus Pargmann (2):
dma: imx-dma: Add oftree support
DMA: imx-dma: imxdma->dev used uninitialized
Nicolas Ferre (5):
dmaengine: at_hdmac/trivial: correct typo in comment
dmaengine: at_hdmac: extend hardware handshaking interface identification
dmaengine: at_hdmac/trivial: rearrange CFG register bits assignment
dmaengine: at_hdmac: remove unsuded atc_cleanup_descriptors()
dmaengine/trivial: at_hdmac: add curly brackets to if/else expressions
Qiao Zhou (1):
dma: mmp_tdma: disable irq when disabling dma channel
Rongjun Ying (1):
dmaengine: sirf: set dma residue based on the current dma transfer position
Shawn Guo (1):
dma: imx-sdma: move to generic device tree bindings
Vinod Koul (1):
dmaengine: dw: select DW_DMAC_BIG_ENDIAN_IO automagically
Will Deacon (2):
dma: pl330: rip out broken, redundant ID probing
dma: pl330: use dma_addr_t for describing bus addresses
.../devicetree/bindings/dma/atmel-dma.txt | 7 +-
.../devicetree/bindings/dma/fsl-imx-dma.txt | 48 ++
.../devicetree/bindings/dma/fsl-imx-sdma.txt | 56 ++
Documentation/devicetree/bindings/dma/shdma.txt | 75 +++
MAINTAINERS | 3 +-
arch/arm/mach-lpc32xx/phy3250.c | 4 +-
arch/arm/mach-spear/spear3xx.c | 4 +-
arch/arm/mach-spear/spear6xx.c | 4 +-
arch/mips/include/asm/mach-jz4740/dma.h | 56 --
arch/mips/include/asm/mach-jz4740/platform.h | 1 +
arch/mips/jz4740/Makefile | 2 +-
arch/mips/jz4740/board-qi_lb60.c | 1 +
arch/mips/jz4740/clock.c | 2 +-
arch/mips/jz4740/dma.c | 287 ---------
arch/mips/jz4740/platform.c | 21 +
drivers/dma/Kconfig | 26 +-
drivers/dma/Makefile | 3 +-
drivers/dma/amba-pl08x.c | 8 +-
drivers/dma/at_hdmac.c | 211 +++++--
drivers/dma/at_hdmac_regs.h | 5 +
drivers/dma/dma-jz4740.c | 617 ++++++++++++++++++++
drivers/dma/dw/Kconfig | 29 +
drivers/dma/dw/Makefile | 8 +
drivers/dma/{dw_dmac.c => dw/core.c} | 320 ++---------
drivers/dma/dw/internal.h | 70 +++
drivers/dma/dw/pci.c | 101 ++++
drivers/dma/dw/platform.c | 317 ++++++++++
drivers/dma/{dw_dmac_regs.h => dw/regs.h} | 7 +
drivers/dma/fsldma.c | 5 +-
drivers/dma/imx-dma.c | 77 +++-
drivers/dma/imx-sdma.c | 40 ++
drivers/dma/mmp_tdma.c | 4 +
drivers/dma/mxs-dma.c | 2 +-
drivers/dma/of-dma.c | 17 +-
drivers/dma/pl330.c | 29 +-
drivers/dma/ppc4xx/adma.c | 5 +-
drivers/dma/sh/Makefile | 2 +-
drivers/dma/sh/shdma-base.c | 26 +-
drivers/dma/sh/shdma-of.c | 82 +++
drivers/dma/sh/shdma.c | 33 +-
drivers/dma/sirf-dma.c | 17 +
drivers/dma/tegra20-apb-dma.c | 3 +-
drivers/dma/timb_dma.c | 2 -
include/dt-bindings/dma/at91.h | 27 +
include/linux/amba/pl08x.h | 8 +-
include/linux/of_dma.h | 1 -
include/linux/platform_data/dma-atmel.h | 4 +
include/linux/platform_data/dma-imx.h | 6 +-
include/linux/sh_dma.h | 2 -
include/linux/shdma-base.h | 3 +
50 files changed, 1889 insertions(+), 799 deletions(-)
create mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-dma.txt
create mode 100644 Documentation/devicetree/bindings/dma/shdma.txt
delete mode 100644 arch/mips/jz4740/dma.c
create mode 100644 drivers/dma/dma-jz4740.c
create mode 100644 drivers/dma/dw/Kconfig
create mode 100644 drivers/dma/dw/Makefile
rename drivers/dma/{dw_dmac.c => dw/core.c} (85%)
create mode 100644 drivers/dma/dw/internal.h
create mode 100644 drivers/dma/dw/pci.c
create mode 100644 drivers/dma/dw/platform.c
rename drivers/dma/{dw_dmac_regs.h => dw/regs.h} (97%)
create mode 100644 drivers/dma/sh/shdma-of.c
create mode 100644 include/dt-bindings/dma/at91.h
--
Thanks
~Vinod
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT PULL] slave-dmaengine updates
2013-07-07 4:17 Vinod Koul
@ 2013-07-07 21:39 ` Linus Torvalds
2013-07-08 2:02 ` Vinod Koul
0 siblings, 1 reply; 12+ messages in thread
From: Linus Torvalds @ 2013-07-07 21:39 UTC (permalink / raw)
To: Vinod Koul; +Cc: Linux Kernel Mailing List, Dan Williams
On Sat, Jul 6, 2013 at 9:17 PM, Vinod Koul <vinod.koul@intel.com> wrote:
>
> Once you have some time from extended weekend celebrations please consider
> pulling the following to get:
> - Various fixes and PCI driver for dw_dmac by Andy
> - DT binding for imx-dma by Markus & imx-sdma by Shawn
> - DT fixes for dmaengine by Lars
> - jz4740 dmac driver by Lars
> - and various fixes across the drivers
Sadly, I noticed much too late that I should have checked the
time-stamps on this too. Almost all of the commits seem to have been
rebased recently. Not quite minutes before the pull request, but 90%
of the commits seem to have been created long after the merge window
opened.
I have already pushed this out so it's too late now, but if I had
noticed earlier I would have rejected this pull too.
Today has not been a good day for pulling. If it wasn't for the
__cpuinit removal pull, I wouldn't have had *anything* today that did
things properly.
Linus "very annoyed" Torvalds
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT PULL] slave-dmaengine updates
2013-07-07 21:39 ` Linus Torvalds
@ 2013-07-08 2:02 ` Vinod Koul
0 siblings, 0 replies; 12+ messages in thread
From: Vinod Koul @ 2013-07-08 2:02 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Linux Kernel Mailing List, Dan Williams
On Sun, Jul 07, 2013 at 02:39:18PM -0700, Linus Torvalds wrote:
> On Sat, Jul 6, 2013 at 9:17 PM, Vinod Koul <vinod.koul@intel.com> wrote:
> >
> > Once you have some time from extended weekend celebrations please consider
> > pulling the following to get:
> > - Various fixes and PCI driver for dw_dmac by Andy
> > - DT binding for imx-dma by Markus & imx-sdma by Shawn
> > - DT fixes for dmaengine by Lars
> > - jz4740 dmac driver by Lars
> > - and various fixes across the drivers
>
> Sadly, I noticed much too late that I should have checked the
> time-stamps on this too. Almost all of the commits seem to have been
> rebased recently. Not quite minutes before the pull request, but 90%
> of the commits seem to have been created long after the merge window
> opened.
I should have mentioned in my pull request. I had to rebase many commits as
there were some duplicate due to bad merge on my part. Wouldnt have been good
idea to send you along with thses. All these have been in -next for quite some
time
>
> I have already pushed this out so it's too late now, but if I had
> noticed earlier I would have rejected this pull too.
> Today has not been a good day for pulling. If it wasn't for the
> __cpuinit removal pull, I wouldn't have had *anything* today that did
> things properly.
>
> Linus "very annoyed" Torvalds
Thanks a bunch for merging
Sorry, will try to ensure its Linus "very happy" Torvalds next time...
Thanks
~Vinod
--
^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL] slave-dmaengine updates
@ 2013-05-08 2:47 Vinod Koul
0 siblings, 0 replies; 12+ messages in thread
From: Vinod Koul @ 2013-05-08 2:47 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, Dan Williams
[-- Attachment #1: Type: text/plain, Size: 6885 bytes --]
Hey Linus,
Here is the pull request for this merge window. Btw are you going to call it
3.10 or 4.0? .... 4.0 sounds much better :)
This time we have dmatest improvements from Andy along with dw_dmac fixes. He
has also done support for acpi for dmanegine
Also we have bunch of fixes going in DT support for dmanegine for various folks
Then Haswell and other ioat changes from Dave and SUDMAC support from Shimoda.
The following changes since commit 41ef2d5678d83af030125550329b6ae8b74618fa:
Linus Torvalds (1):
Linux 3.9-rc7
are available in the git repository at:
git://git.infradead.org/users/vkoul/slave-dma.git for-linus
Andy Shevchenko (17):
dmatest: cancel thread immediately when asked for
dmatest: allocate memory for pq_coefs from heap
dmatest: create dmatest_info to keep test parameters
dmatest: move dmatest_channels and nr_channels to dmatest_info
dmatest: split test parameters to separate structure
dmatest: run test via debugfs
dmatest: return actual state in 'run' file
dmatest: define MAX_ERROR_COUNT constant
dmatest: gather test results in the linked list
dmatest: append verify result to results
dw_dmac: don't wait for FIFO_EMPTY endlessly in dwc_chan_pause
dw_dmac: fix style of the comments
dw_dmac: rename DT related methods to reflect their belonging
dw_dmac: remove unnecessary ENODEV check
dma: acpi-dma: introduce ACPI DMA helpers
dmaengine: call acpi_dma_request_slave_channel as well
dw_dmac: add ACPI support
Arnd Bergmann (1):
dmaengine: dw_dmac: simplify master selection
Barry Song (2):
dmaengine:sirf:take clock and enable it while probing
dmaengine: sirf: move driver init from module_init to subsys_initcall
Dave Jiang (13):
ioatdma: make debug output more readable
ioatdma: allow all channels to have irq coalescing support
ioatdma: Adding Haswell devid for ioatdma
ioatdma: Adding PCI IDs for Intel Atom S1200 product family ioatdma devices
ioatdma: Add 64bit chansts register read for ioat v3.3.
ioatdma: channel reset scheme fixup on Intel Atom S1200 platforms
ioatdma: skip legacy reset bits since v3.3 plattform doesn't need it
ioatdma: Removing PQ val disable for cb3.3
ioatdma: skip silicon bug workaround for pq_align for cb3.3
ioatdma: Removing hw bug workaround for CB3.x .2 and earlier
ioatdma: Adding support for 16 src PQ ops and super extended descriptors
ioatdma: S1200 platforms ioatdma channel 2 and 3 falsely advertise RAID cap
ioatdma: Adding write back descriptor error status support for ioatdma 3.3
Fabio Estevam (1):
dma: ipu: ipu_idmac: Fix section mismatch
Fengguang Wu (1):
ioatdma: ioat3_alloc_sed can be static
Jassi Brar (1):
DMA: PL330: allow submitting 2 requests at a time
Jon Hunter (1):
dmaengine: OMAP: Register SDMA controller with Device Tree DMA driver
Lars-Peter Clausen (4):
dma: Make the 'mask' parameter of __dma_request_channel const
dma: of: Remove unnecessary list_empty check
dma: of: Fix of_node reference leak
dma:of: Use a mutex to protect the of_dma_list
Laxman Dewangan (1):
dma: tegra: implement suspend/resume callbacks
Ludovic Desroches (1):
at_hdmac: move to generic DMA binding
Markus Pargmann (1):
DMA: of: Constant names
Maxin B. John (2):
dma: timb_dma: Fix compiler warning
dma: Remove erroneous __exit and __exit_p() references
Sachin Kamat (1):
dma: pl330: Convert to devm_ioremap_resource()
Shimoda, Yoshihiro (2):
dma: sh: add Kconfig
sudmac: add support for SUDMAC
Stephen Warren (1):
dma: tegra: assume CONFIG_OF
Syam Sidhardhan (1):
dma: imx-dma: Remove redundant NULL check before kfree
Tomoya MORINAGA (1):
pch_dma: Use GFP_ATOMIC because called from interrupt context
Vinod Koul (1):
Merge branch 'topic/of' into for-linus
Viresh Kumar (1):
DMA: OF: Check properties value before running be32_to_cpup() on it
Documentation/acpi/enumeration.txt | 77 ++
.../devicetree/bindings/dma/atmel-dma.txt | 35 +-
Documentation/dmatest.txt | 81 ++
arch/arm/mach-omap2/dma.c | 4 +
drivers/dma/Kconfig | 16 +-
drivers/dma/Makefile | 3 +-
drivers/dma/acpi-dma.c | 279 ++++++
drivers/dma/at_hdmac.c | 97 ++-
drivers/dma/at_hdmac_regs.h | 4 +
drivers/dma/coh901318.c | 4 +-
drivers/dma/dmaengine.c | 17 +-
drivers/dma/dmatest.c | 887 ++++++++++++++++---
drivers/dma/dw_dmac.c | 203 +++--
drivers/dma/dw_dmac_regs.h | 6 +-
drivers/dma/imx-dma.c | 7 +-
drivers/dma/imx-sdma.c | 4 +-
drivers/dma/ioat/dma.c | 8 +-
drivers/dma/ioat/dma.h | 53 ++-
drivers/dma/ioat/dma_v2.h | 2 +
drivers/dma/ioat/dma_v3.c | 912 +++++++++++++++++---
drivers/dma/ioat/hw.h | 88 ++-
drivers/dma/ioat/pci.c | 20 +
drivers/dma/ioat/registers.h | 4 +
drivers/dma/ipu/ipu_idmac.c | 6 +-
drivers/dma/of-dma.c | 96 +--
drivers/dma/omap-dma.c | 38 +-
drivers/dma/pch_dma.c | 2 +-
drivers/dma/pl330.c | 10 +-
drivers/dma/sh/Kconfig | 24 +
drivers/dma/sh/Makefile | 3 +-
drivers/dma/sh/sudmac.c | 428 +++++++++
drivers/dma/sirf-dma.c | 24 +-
drivers/dma/tegra20-apb-dma.c | 87 ++-
drivers/dma/timb_dma.c | 2 +-
drivers/dma/txx9dmac.c | 8 +-
include/linux/acpi_dma.h | 116 +++
include/linux/dmaengine.h | 15 +-
include/linux/of_dma.h | 10 +-
include/linux/sudmac.h | 52 ++
39 files changed, 3215 insertions(+), 517 deletions(-)
create mode 100644 Documentation/dmatest.txt
create mode 100644 drivers/dma/acpi-dma.c
create mode 100644 drivers/dma/sh/Kconfig
create mode 100644 drivers/dma/sh/sudmac.c
create mode 100644 include/linux/acpi_dma.h
create mode 100644 include/linux/sudmac.h
--
Thanks
~Vinod
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL] slave-dmaengine updates
@ 2013-02-22 4:32 Vinod Koul
0 siblings, 0 replies; 12+ messages in thread
From: Vinod Koul @ 2013-02-22 4:32 UTC (permalink / raw)
To: Linus; +Cc: Dan Williams, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 11569 bytes --]
Hi Linus,
Here is the slave-dmaengine updates.
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
Thanks
~Vinod
----------------------
The following changes since commit d1c3ed669a2d452cacfb48c2d171a1f364dae2ed:
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
Alessandro Rubini (1):
pl080.h: moved from arm/include/asm/hardware to include/linux/amba/
Andy Shevchenko (34):
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
dw_dmac: absence of pdata isn't critical when autocfg is set
dw_dmac: check for mapping errors
dw_dmac: remove redundant check
dw_dmac: update tx_node_active in dwc_do_single_block
dma: dw_dmac: add dwc_chan_pause and dwc_chan_resume
dmaengine: introduce is_slave_direction function
dma: at_hdmac: check direction properly for cyclic transfers
dma: dw_dmac: check direction properly in dw_dma_cyclic_prep
dma: ep93xx_dma: reuse is_slave_direction helper
dma: ipu_idmac: reuse is_slave_direction helper
dma: ste_dma40: reuse is_slave_direction helper
dw_dmac: call .probe after we have a device in place
dw_dmac: store direction in the custom channel structure
dw_dmac: make usage of dw_dma_slave optional
dw_dmac: backlink to dw_dma in dw_dma_chan is superfluous
dw_dmac: allocate dma descriptors from DMA_COHERENT memory
dw_dmac: don't exceed AHB master number in dwc_get_data_width
dw_dmac: move soft LLP code from tasklet to dwc_scan_descriptors
dw_dmac: print out DW_PARAMS and DWC_PARAMS when debug
dw_dmac: remove unnecessary tx_list field in dw_dma_chan
dw_dmac: introduce total_len field in struct dw_desc
dw_dmac: fill individual length of descriptor
dw_dmac: return proper residue value
dw_dmac: apply default dma_mask if needed
dma: of-dma: protect list write operation by spin_lock
dmaengine.h: remove redundant else keyword
dma: coh901318: avoid unbalanced locking
dma: coh901318: set residue only if dma is in progress
edma: do not waste memory for dma_mask
dma: tegra20-apb-dma: remove unnecessary assignment
Arnd Bergmann (1):
Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT"
Barry Song (4):
dmaengine: sirf: enable the driver support new SiRFmarco SoC
DMAEngine: add dmaengine_prep_interleaved_dma wrapper for interleaved api
DMAEngine: sirf: add DMA pause/resume support
DMAEngine: sirf: lock the shared registers access in sirfsoc_dma_terminate_all
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
Cong Ding (3):
dma: remove unnecessary null pointer check in mmp_pdma.c
dma: sh/shdma-base.c: remove unnecessary null pointer check
dma: of-dma.c: fix memory leakage
Dave Jiang (3):
ioat: Add alignment workaround for IVB platforms
ioat: remove chanerr mask setting for IOAT v3.x
ioatdma: fix race between updating ioat->head and IOAT_COMPLETION_PENDING
Fabio Baltieri (8):
dmaengine: ste_dma40: add a done queue for completed descriptors
dmaengine: ste_dma40: add missing kernel-doc entry
dmaengine: ste_dma40: minor cosmetic fixes
dmaengine: ste_dma40: minor code readability fixes
dmaengine: ste_dma40: add software lli support
dmaengine: set_dma40: ignore spurious interrupts
dmaengine: set_dma40: balance clock in probe fail code
dmaengine: ste_dma40: do not remove descriptors for cyclic transfers
Fabio Estevam (1):
dma: mxs-dma: Fix build warnings with W=1
Fengguang Wu (1):
dmaengine: ioat - fix spare sparse complain
Gerald Baeza (2):
dmaengine: ste_dma40: support fixed physical channel allocation
dmaengine: ste_dma40: physical channels number correction
Guennadi Liakhovetski (1):
dma: sh: Don't use ENODEV for failing slave lookup
Heikki Krogerus (3):
dmaengine: dw_dmac: remove CLK dependency
dmaengine: dw_dmac: amend description and indentation
dma: dw_dmac: clear suspend bit during termination
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
Laxman Dewangan (2):
dma: tegra: add support for channel wise pause
dma: tegra: add support for Tegra114 SoC
Maciej Sosnowski (1):
dca: check against empty dca_domains list before unregister provider
Matt Porter (2):
of: dma: fix typos in generic dma binding definition
dma: edma: fix slave config dependency on direction
Mika Westerberg (1):
dw_dmac: add support for Lynxpoint DMA controllers
Narayanan (1):
dmaengine: ste_dma40: reset priority bit for logical channels
Narayanan G (1):
dmaengine: ste_dma40: don't check for pm_runtime_suspended()
Padmavathi Venna (4):
DMA: PL330: Add new pl330 filter for DT case.
DMA: PL330: Add xlate function
DMA: PL330: Register the DMA controller with the generic DMA helpers
ARM: dts: pl330: Add #dma-cells for generic dma binding support
Per Forlin (3):
dmaengine: ste_dma40: use writel_relaxed for lcxa
dmaengine: ste_dma40: set dma max seg size
dmaengine: ste_dma40: limit burst size to 16
Rabin Vincent (1):
dmaengine: ste_dma40: don't allow high priority dest event lines
Sachin Kamat (1):
DMA: PL330: Use devm_* functions
Shiraz Hashim (1):
dmaengine/dmatest: terminate transfers only in case of errors
Tong Liu (1):
dmaengine: ste_dma40: support more than 128 event lines
Vinod Koul (5):
of: dma- fix build break for !CONFIG_OF
dmaengine: fix build failure due to missing semi-colon
dmaengine: fix !of_dma compilation warning
Merge tag 'ux500-dma40' of //git.linaro.org/people/fabiobaltieri/linux.git
dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c
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
.../devicetree/bindings/dma/arm-pl330.txt | 21 +-
Documentation/devicetree/bindings/dma/dma.txt | 81 +++
Documentation/devicetree/bindings/dma/snps-dma.txt | 44 ++
arch/arm/boot/dts/exynos5250.dtsi | 12 +
arch/arm/mach-s3c64xx/dma.c | 2 +-
arch/arm/mach-spear3xx/spear3xx.c | 1 -
arch/arm/mach-spear6xx/spear6xx.c | 2 +-
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 | 11 +-
drivers/dma/Makefile | 2 +
drivers/dma/amba-pl08x.c | 10 +-
drivers/dma/at_hdmac.c | 10 +-
drivers/dma/at_hdmac_regs.h | 8 +-
drivers/dma/coh901318.c | 4 +-
drivers/dma/coh901318_lli.c | 2 +-
drivers/dma/dmaengine.c | 21 +-
drivers/dma/dmatest.c | 22 +-
drivers/dma/dw_dmac.c | 523 ++++++++++++++------
drivers/dma/dw_dmac_regs.h | 27 +-
drivers/dma/edma.c | 61 ++--
drivers/dma/ep93xx_dma.c | 3 +-
drivers/dma/ioat/dma.c | 11 +-
drivers/dma/ioat/dma.h | 1 +
drivers/dma/ioat/dma_v2.c | 113 +++--
drivers/dma/ioat/dma_v3.c | 216 ++++++---
drivers/dma/ioat/hw.h | 11 +
drivers/dma/ioat/pci.c | 11 -
drivers/dma/iop-adma.c | 45 +-
drivers/dma/ipu/ipu_idmac.c | 2 +-
drivers/dma/ipu/ipu_irq.c | 1 -
drivers/dma/mmp_pdma.c | 6 +-
drivers/dma/mv_xor.c | 40 +-
drivers/dma/mxs-dma.c | 8 +-
drivers/dma/of-dma.c | 267 ++++++++++
drivers/dma/pch_dma.c | 13 +-
drivers/dma/pl330.c | 101 +++--
drivers/dma/sh/shdma-base.c | 3 -
drivers/dma/sh/shdma.c | 2 +-
drivers/dma/sirf-dma.c | 73 +++-
drivers/dma/ste_dma40.c | 491 ++++++++++++++-----
drivers/dma/ste_dma40_ll.c | 29 +-
drivers/dma/ste_dma40_ll.h | 130 +++++-
drivers/dma/tegra20-apb-dma.c | 57 ++-
drivers/misc/carma/carma-fpga-program.c | 2 +-
drivers/misc/carma/carma-fpga.c | 6 +-
drivers/mtd/nand/fsmc_nand.c | 22 +-
.../asm/hardware => include/linux/amba}/pl080.h | 2 +-
include/linux/dmaengine.h | 48 +-
include/linux/dw_dmac.h | 45 +-
include/linux/of_dma.h | 74 +++
include/linux/platform_data/dma-ste-dma40.h | 13 +
net/ipv4/tcp.c | 8 +-
56 files changed, 2038 insertions(+), 705 deletions(-)
create mode 100644 Documentation/devicetree/bindings/dma/dma.txt
create mode 100644 drivers/dma/of-dma.c
rename {arch/arm/include/asm/hardware => include/linux/amba}/pl080.h (99%)
create mode 100644 include/linux/of_dma.h
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL] slave-dmaengine updates
@ 2012-01-16 15:06 Vinod Koul
2012-01-18 2:41 ` Linus Torvalds
0 siblings, 1 reply; 12+ messages in thread
From: Vinod Koul @ 2012-01-16 15:06 UTC (permalink / raw)
To: Linus; +Cc: linux-kernel, Dan, Arnd Bergmann
Hi Linus,
Here is the slave-dmaengine updates which include a new DMA engine API
for 2D interleaved transfers along with fixes for slave dma_tranfer
direction along with usual fixes and updates on bunch of the slave dma
drivers.
Thanks
~Vinod
The following changes since commit 1ea6b8f48918282bdca0b32a34095504ee65bab5:
Linus Torvalds (1):
Linux 3.2-rc1
are available in the git repository at:
git://git.infradead.org/users/vkoul/slave-dma.git next
Adrian Hunter (2):
dmaengine: intel_mid_dma: locking and freeing fixes
dmaengine: intel_mid_dma: error path fix
Axel Lin (1):
dmaengine: convert drivers/dma/* to use module_platform_driver()
Boojin Kim (1):
DMA: PL330: Fix build warning
Ciaran McCormick (1):
dma: fix spacing for method declaration, coding style issue in iop-adma.c
Guennadi Liakhovetski (2):
dma: shdma: fix runtime PM: clear channel buffers on reset
ARM: mach-shmobile: specify CHCLR registers on SH7372
Haitao Zhang (1):
dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit
Huang Shijie (3):
IMX/DMA : set the DMA direction in the sdma_control()
IMX/SDMA : save the real count for one DMA transaction.
mtd: fix compile error for gpmi-nand
Jassi Brar (1):
DMAEngine: Define interleaved transfer request api
Kristen Carlson Accardi (1):
dmaengine: intel_mid_dma: remove legacy pm interface
Lothar Waßmann (4):
dma: mxs-dma: fix a typo in comment
dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.
dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe
dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels
Mika Westerberg (1):
dma/ep93xx_dma: prevent ep93xx_dma_tasklet() to reference an empty list
Narayanan G (3):
dmaengine/ste_dma40: support pm in dma40
dmaengine/ste_dma40: Add support to use lcla area from esram
dmaengine/ste_dma40: allow fixed physical channel
Nicolas Ferre (5):
dmaengine: at_hdmac: platform data move to use .id_table
dmaengine: at_hdmac: add device tree support
dmaengine: at_hdmac: add const to struct platform_device_id definition
dmaengine: at_hdmac: empty entry shape modification
dmaengine: at_hdmac: simplify device selection from platform data or DT
Rabin Vincent (1):
dmaengine/ste_dma40: clear LNK on channel startup
Rafal Prylowski (1):
dma/ep93xx_dma: fix initialization of M2M control register
Rongjun Ying (1):
dmaengine: add CSR SiRFprimaII DMAC driver
Sascha Hauer (3):
dma i.MX: remove individual SOC dependency
i.MX IPU DMA: Fix wrong burstsize settings
video i.MX IPU: Fix display connections
Shawn Guo (4):
dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
mmc: mxs-mmc: fix the dma_transfer_direction migration
mtd: gpmi-nand: move to dma_transfer_direction
ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
Tomoya MORINAGA (2):
pch_dma: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
pch_dma: Support new device LAPIS Semiconductor ML7831 IOH
Tushar Behera (1):
DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove
Vinod Koul (13):
dmaengine: add new enum dma_transfer_direction
dmaengine: move drivers to dma_transfer_direction
plat-samsung: move to dma_transfer_direction
media, video: move to dma_transfer_direction
carma: move to dma_transfer_direction
mmc-host: move to dma_transfer_direction
spi, serial: move to dma_transfer_direction
sound-soc: move to dma_transfer_direction
net-ks8842: move to dma_transfer_direction
USB-musb: move to dma_transfer_direction
USB-renesas: move to dma_transfer_direction
Merge branch 'dma_slave_direction' into next_test_dirn
dmaengine: timb_dma: fix the spare warinings
Viresh Kumar (2):
dmaengine/dw_dmac: Reconfigure interrupt and chan_cfg register on resume
dmaengine/amba-pl08x: Config ccfg and increment phychan_hold if phychan is true
.../devicetree/bindings/dma/atmel-dma.txt | 14 +
Documentation/dmaengine.txt | 8 +
MAINTAINERS | 1 +
arch/arm/mach-ep93xx/include/mach/dma.h | 6 +-
arch/arm/mach-shmobile/setup-sh7372.c | 15 +-
arch/arm/plat-mxc/include/mach/mx3fb.h | 15 +
arch/arm/plat-nomadik/include/plat/ste_dma40.h | 11 +-
arch/arm/plat-samsung/dma-ops.c | 4 +-
arch/arm/plat-samsung/include/plat/dma-ops.h | 4 +-
drivers/dma/Kconfig | 27 +-
drivers/dma/Makefile | 1 +
drivers/dma/amba-pl08x.c | 41 +-
drivers/dma/at_hdmac.c | 103 +++-
drivers/dma/at_hdmac_regs.h | 1 +
drivers/dma/coh901318.c | 12 +-
drivers/dma/coh901318_lli.c | 23 +-
drivers/dma/coh901318_lli.h | 4 +-
drivers/dma/dmaengine.c | 4 +-
drivers/dma/dw_dmac.c | 83 ++-
drivers/dma/dw_dmac_regs.h | 1 +
drivers/dma/ep93xx_dma.c | 90 ++-
drivers/dma/fsldma.c | 4 +-
drivers/dma/imx-dma.c | 10 +-
drivers/dma/imx-sdma.c | 27 +-
drivers/dma/intel_mid_dma.c | 39 +-
drivers/dma/intel_mid_dma_regs.h | 4 +-
drivers/dma/iop-adma.c | 16 +-
drivers/dma/ipu/ipu_idmac.c | 29 +-
drivers/dma/mpc512x_dma.c | 12 +-
drivers/dma/mxs-dma.c | 53 +--
drivers/dma/pch_dma.c | 20 +-
drivers/dma/pl330.c | 38 +-
drivers/dma/shdma.c | 72 ++-
drivers/dma/sirf-dma.c | 707 ++++++++++++++++++++
drivers/dma/ste_dma40.c | 441 +++++++++++--
drivers/dma/ste_dma40_ll.h | 11 +
drivers/dma/timb_dma.c | 30 +-
drivers/dma/txx9dmac.c | 12 +-
drivers/media/video/mx3_camera.c | 2 +-
drivers/media/video/timblogiw.c | 2 +-
drivers/misc/carma/carma-fpga-program.c | 2 +-
drivers/mmc/host/atmel-mci.c | 10 +-
drivers/mmc/host/mmci.c | 11 +-
drivers/mmc/host/mxcmmc.c | 10 +-
drivers/mmc/host/mxs-mmc.c | 10 +-
drivers/mmc/host/sh_mmcif.c | 4 +-
drivers/mmc/host/tmio_mmc_dma.c | 4 +-
drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 22 +-
drivers/net/ethernet/micrel/ks8842.c | 4 +-
drivers/spi/spi-dw-mid.c | 8 +-
drivers/spi/spi-ep93xx.c | 9 +-
drivers/spi/spi-pl022.c | 8 +-
drivers/spi/spi-topcliff-pch.c | 4 +-
drivers/tty/serial/amba-pl011.c | 8 +-
drivers/tty/serial/pch_uart.c | 4 +-
drivers/tty/serial/sh-sci.c | 4 +-
drivers/usb/musb/ux500_dma.c | 4 +-
drivers/usb/renesas_usbhs/fifo.c | 4 +-
drivers/video/mx3fb.c | 65 +--
include/linux/amba/pl08x.h | 4 +-
include/linux/dmaengine.h | 99 +++-
include/linux/dw_dmac.h | 2 +-
include/linux/mtd/gpmi-nand.h | 68 ++
include/linux/sh_dma.h | 4 +-
include/linux/sirfsoc_dma.h | 6 +
sound/atmel/abdac.c | 2 +-
sound/atmel/ac97c.c | 10 +-
sound/soc/ep93xx/ep93xx-pcm.c | 4 +-
sound/soc/imx/imx-pcm-dma-mx2.c | 6 +-
sound/soc/mxs/mxs-pcm.c | 2 +-
sound/soc/samsung/dma.c | 4 +-
sound/soc/sh/siu_pcm.c | 4 +-
sound/soc/txx9/txx9aclc.c | 2 +-
73 files changed, 1876 insertions(+), 533 deletions(-)
create mode 100644 Documentation/devicetree/bindings/dma/atmel-dma.txt
create mode 100644 drivers/dma/sirf-dma.c
create mode 100644 include/linux/mtd/gpmi-nand.h
create mode 100644 include/linux/sirfsoc_dma.h
--
~Vinod
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT PULL] slave-dmaengine updates
2012-01-16 15:06 Vinod Koul
@ 2012-01-18 2:41 ` Linus Torvalds
2012-01-18 20:03 ` Vinod Koul
0 siblings, 1 reply; 12+ messages in thread
From: Linus Torvalds @ 2012-01-18 2:41 UTC (permalink / raw)
To: Vinod Koul; +Cc: linux-kernel, Dan, Arnd Bergmann
On Mon, Jan 16, 2012 at 7:06 AM, Vinod Koul <vinod.koul@intel.com> wrote:
>
> Here is the slave-dmaengine updates which include a new DMA engine API
> for 2D interleaved transfers along with fixes for slave dma_tranfer
> direction along with usual fixes and updates on bunch of the slave dma
> drivers.
Ok, please verify my conflict resolution. It all looked pretty
trivial, but affected code that I don't know nor can I even
test-compile.
Linus
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT PULL] slave-dmaengine updates
2012-01-18 2:41 ` Linus Torvalds
@ 2012-01-18 20:03 ` Vinod Koul
0 siblings, 0 replies; 12+ messages in thread
From: Vinod Koul @ 2012-01-18 20:03 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, Dan, Arnd Bergmann
On Tue, 2012-01-17 at 18:41 -0800, Linus Torvalds wrote:
> On Mon, Jan 16, 2012 at 7:06 AM, Vinod Koul <vinod.koul@intel.com> wrote:
> >
> > Here is the slave-dmaengine updates which include a new DMA engine API
> > for 2D interleaved transfers along with fixes for slave dma_tranfer
> > direction along with usual fixes and updates on bunch of the slave dma
> > drivers.
>
> Ok, please verify my conflict resolution. It all looked pretty
> trivial, but affected code that I don't know nor can I even
> test-compile.
The resolution look fine to me. I have built and didn't find any issues.
Thanks
--
~Vinod
^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL] slave-dmaengine updates
@ 2011-10-31 4:40 Vinod Koul
0 siblings, 0 replies; 12+ messages in thread
From: Vinod Koul @ 2011-10-31 4:40 UTC (permalink / raw)
To: Linus; +Cc: Dan, linux-kernel
Hi Linus,
Here is the slave-dmaengine updates which include consolidation of
samsung dma drivers from arm drivers to use dmaengine, enhancements and
fixes to amba-pl08x driver along with other usual fixes.
Since I have not been able to get my key signed with enough people yet,
so not sending this with key. Hopefully next time it would be a signed
message which you can verify. Also my tree is on infradead servers (same
one you pulled last time), let me know if you are okay with this server
or i should consider moving it.
Thanks
~Vinod
The following changes since commit c6a389f123b9f68d605bb7e0f9b32ec1e3e14132:
Linus Torvalds (1):
Linux 3.1-rc4
are available in the git repository at:
git://git.infradead.org/users/vkoul/slave-dma.git next
Axel Lin (1):
dmaengine i.MX DMA/SDMA: add missing include of linux/module.h
Barry Song (1):
dmaengine: delete redundant chan_id and chancnt initialization in dma drivers
Boojin Kim (16):
DMA: PL330: Add support runtime PM for PL330 DMAC
DMA: PL330: Update PL330 DMA API driver
DMA: PL330: Support DMA_SLAVE_CONFIG command
DMA: PL330: Remove the start operation for handling DMA_TERMINATE_ALL command
DMA: PL330: Add DMA_CYCLIC capability
ARM: SAMSUNG: Update to use PL330-DMA driver
ARM: SAMSUNG: Add common DMA operations
ARM: EXYNOS4: Use generic DMA PL330 driver
ARM: S5PV210: Use generic DMA PL330 driver
ARM: S5PC100: Use generic DMA PL330 driver
ARM: S5P64X0: Use generic DMA PL330 driver
ARM: SAMSUNG: Remove S3C-PL330-DMA driver
spi/s3c64xx: Add support DMA engine API
spi/s3c64xx: Merge dma control code
ASoC: Samsung: Update DMA interface
ARM: SAMSUNG: Remove Samsung specific enum type for dma direction
Dan Carpenter (1):
dma/timberdale: free_irq() on an error path
Guennadi Liakhovetski (4):
dmatest: make dmatest threads freezable
serial: sh-sci: don't filter on DMA device, use only channel ID
dmaengine: shdma: protect against the IRQ handler
dma: shdma: transfer based runtime PM
Lothar Waßmann (1):
mxs-dma: enable CLKGATE before accessing registers
Mika Westerberg (1):
dmaengine/ep93xx_dma: add module.h include
Nicolas Ferre (4):
dmaengine: at_hdmac: replace spin_lock* with irqsave variants
dmaengine: at_hdmac: improve power management routines
dmaengine: at_hdmac: add wrappers for testing channel state
dmaengine: at_hdmac: fix way to specify cyclic capability
Per Forlin (4):
dmaengine/ste_dma40: add missing kernel doc for pending_queue
dmaengine/ste_dma40: remove duplicate call to d40_pool_lli_free().
dmaengine/ste_dma40: fix Oops due to double free of client descriptor
dmaengine/ste_dma40: fix memory leak due to prepared descriptors
Russell King - ARM Linux (1):
dmaengine: amba-pl08x: make filter check that the channel is owned by pl08x
Sascha Hauer (3):
dmaengine i.MX SDMA: lock channel 0
dmaengine i.MX SDMA: set firmware scripts addresses to negative value initially
dmaengine i.MX SDMA: use request_firmware_nowait
Tomoya MORINAGA (2):
pch_dma: Fix suspend issue
pch_dma: Reduce wasting memory
Vinod Koul (5):
dmaengine: add helper function for slave_single
dmaengine: remove struct scatterlist for header
Merge branch 'next' into v3.1-rc4
Merge branch 'samsung_dma' into next
dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle
Viresh Kumar (21):
dmaengine/dmatest: Terminate transfers on all channels in case of error or exit
ARM: asm/pl080.h: Protect against multiple inclusion of header file
dmaengine/amba-pl08x: Resolve formatting issues
dmaengine/amba-pl08x: Rearrange inclusion of header files in ascending order
dmaengine/amba-pl08x: pass (*ptr) to sizeof() instead of (struct xyz)
dmaengine/amba-pl08x: Complete doc comment for struct pl08x_txd
dmaengine/amba-pl08x: Remove redundant comment and rewrite original
dmaengine/amba-pl08x: Changing few prints to dev_dbg from dev_info
dmaengine/amba-pl08x: support runtime PM
dmaengine/amba-pl08x: Simplify pl08x_ensure_on()
dmaengine/amba-pl08x: No need to check "ch->signal < 0"
dmaengine/amba-pl08x: Schedule tasklet in case of error interrupt
dmaengine/amba-pl08x: Get rid of pl08x_pre_boundary()
dmaengine/amba-pl08x: max_bytes_per_lli is TRANSFER_SIZE * src_width (not MIN(width))
dmaengine/amba-pl08x: Add prep_single_byte_llis() routine
dmaengine/amba-pl08x: Align lli_len to max(src.width, dst.width)
dmaengine/amba-pl08x: Choose peripheral bus as master bus
dmaengine/amba-pl08x: Pass flow controller information with slave channel data
dmaengine/amba-pl08x: Call pl08x_free_txd() instead of calling kfree() directly
dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers
dmaengine/amba-pl08x: Check txd->llis_va before freeing dma_pool
arch/arm/include/asm/hardware/pl080.h | 4 +
arch/arm/mach-exynos4/Kconfig | 2 +-
arch/arm/mach-exynos4/clock.c | 11 +-
arch/arm/mach-exynos4/dma.c | 299 +++--
arch/arm/mach-exynos4/include/mach/dma.h | 4 +-
arch/arm/mach-s3c2410/include/mach/dma.h | 20 +-
arch/arm/mach-s3c2412/dma.c | 4 +-
arch/arm/mach-s3c64xx/dma.c | 10 +-
arch/arm/mach-s3c64xx/include/mach/dma.h | 8 +-
arch/arm/mach-s5p64x0/Kconfig | 4 +-
arch/arm/mach-s5p64x0/clock-s5p6440.c | 9 +-
arch/arm/mach-s5p64x0/clock-s5p6450.c | 9 +-
arch/arm/mach-s5p64x0/dma.c | 273 +++--
arch/arm/mach-s5p64x0/include/mach/dma.h | 4 +-
arch/arm/mach-s5pc100/Kconfig | 2 +-
arch/arm/mach-s5pc100/clock.c | 11 +-
arch/arm/mach-s5pc100/dma.c | 323 ++++--
arch/arm/mach-s5pc100/include/mach/dma.h | 4 +-
arch/arm/mach-s5pv210/Kconfig | 2 +-
arch/arm/mach-s5pv210/clock.c | 10 +-
arch/arm/mach-s5pv210/dma.c | 316 ++++--
arch/arm/mach-s5pv210/include/mach/dma.h | 4 +-
arch/arm/plat-s3c24xx/dma.c | 10 +-
arch/arm/plat-samsung/Kconfig | 9 +-
arch/arm/plat-samsung/Makefile | 4 +-
arch/arm/plat-samsung/dma-ops.c | 131 ++
arch/arm/plat-samsung/include/plat/dma-ops.h | 63 +
.../include/plat/{s3c-dma-pl330.h => dma-pl330.h} | 24 +-
arch/arm/plat-samsung/include/plat/dma-s3c24xx.h | 2 +-
arch/arm/plat-samsung/include/plat/dma.h | 10 +-
.../plat-samsung/include/plat/s3c-pl330-pdata.h | 32 -
arch/arm/plat-samsung/s3c-dma-ops.c | 130 ++
arch/arm/plat-samsung/s3c-pl330.c | 1244
--------------------
drivers/dma/Kconfig | 3 +-
drivers/dma/amba-pl08x.c | 640 +++++-----
drivers/dma/at_hdmac.c | 164 ++-
drivers/dma/at_hdmac_regs.h | 24 +
drivers/dma/dmatest.c | 23 +-
drivers/dma/dw_dmac.c | 5 +-
drivers/dma/ep93xx_dma.c | 1 +
drivers/dma/imx-dma.c | 1 +
drivers/dma/imx-sdma.c | 48 +-
drivers/dma/intel_mid_dma.c | 9 +-
drivers/dma/mpc512x_dma.c | 1 -
drivers/dma/mxs-dma.c | 45 +-
drivers/dma/pch_dma.c | 7 +-
drivers/dma/pl330.c | 231 ++++-
drivers/dma/shdma.c | 129 ++-
drivers/dma/shdma.h | 7 +
drivers/dma/ste_dma40.c | 42 +-
drivers/dma/timb_dma.c | 5 +-
drivers/mmc/host/s3cmci.c | 6 +-
drivers/spi/spi-s3c64xx.c | 175 ++--
drivers/tty/serial/sh-sci.c | 25 +-
include/linux/amba/pl08x.h | 30 +-
include/linux/amba/pl330.h | 6 +-
include/linux/dmaengine.h | 13 +-
include/linux/serial_sci.h | 2 -
sound/soc/samsung/ac97.c | 10 +-
sound/soc/samsung/dma.c | 146 +--
sound/soc/samsung/dma.h | 4 +-
61 files changed, 2331 insertions(+), 2463 deletions(-)
create mode 100644 arch/arm/plat-samsung/dma-ops.c
create mode 100644 arch/arm/plat-samsung/include/plat/dma-ops.h
rename arch/arm/plat-samsung/include/plat/{s3c-dma-pl330.h =>
dma-pl330.h} (84%)
delete mode 100644 arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h
create mode 100644 arch/arm/plat-samsung/s3c-dma-ops.c
delete mode 100644 arch/arm/plat-samsung/s3c-pl330.c
--
~Vinod
^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL] slave-dmaengine updates
@ 2011-08-01 10:43 Koul, Vinod
0 siblings, 0 replies; 12+ messages in thread
From: Koul, Vinod @ 2011-08-01 10:43 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, Williams, Dan J
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 5035 bytes --]
Hi Linus,
Here is the slave-dmaengine updates which include general updates to few drivers and
start of the consolidation of arm dma drivers into generic dma controllers
This also had dma-slave documentation updated by Russell
The following changes since commit 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe:
are available in the git repository at:
git://git.infradead.org/users/vkoul/slave-dma.git for-linus
Alexander Stein (1):
pch_dma: Fix channel locking
Axel Lin (3):
dmaengine: imx-sdma: return proper error if kzalloc fails
dma: mxs-dma: fix unterminated platform_device_id table
dma: intel_mid_dma: remove redundant pci_set_drvdata calls
Dong Aisheng (1):
ARM: mxs-dma: reset after disable channel
Grant Likely (1):
Merge remote-tracking branch 'origin' into spi/merge
Guennadi Liakhovetski (1):
dmaengine: failure to get a specific DMA channel is not critical
H Hartley Sweeten (4):
dma: ipu_idmac.c: use resource_size in ioremap
dma: at_hdmac.c: use resource_size
dma/ep93xx_dma.c: local symbols should be static
dma: mv_xor: use resource_size()
Linus Walleij (2):
dmaengine/ste_dma40: use AMBA PrimeCell helper macros
dmaengine/coh901318: fix slave submission semantics
Mika Westerberg (5):
dmaengine: add ep93xx DMA support
ep93xx: add dmaengine platform code
ASoC: ep93xx: convert to use the DMA engine API
ep93xx: remove the old M2P DMA code
spi/ep93xx: add DMA support
Per Forlin (2):
dmaengine/ste_dma40: add a separate queue for pending requests
dmaengine: remove ste_dma40 from issue_pending TODO
Rabin Vincent (1):
dmaengine/ste_dma40: allow memory buswidth/burst to be configured
Rob Herring (1):
dmaengine: pl330: make platform data optional
Robert Marklund (1):
dmaengine/ste_dma40: make the cyclic alloc NOWAIT
Russell King - ARM Linux (10):
DMA: PL08x: remove unused constants
DMA: PL08x: select LLI bus only once per LLI setup
DMA: PL08x: clean up LLI debugging
DMA: PL08x: separately store source/destination slave address
DMA: PL08x: separately store source/destination cctl
DMA: PL08x: constify plchan->cd and plat->slave_channels
DMA: PL08x: cleanup selection of buswidth
DMA: PL08x: avoid recalculating cctl at each prepare
DMA: PL08x: cleanup selection of burst size
Improve slave/cyclic DMA engine documentation
Shawn Guo (1):
dmaengine: mxs-dma: skip request_irq for NO_IRQ
Tomoya MORINAGA (2):
pch_dma: fix DMA issue(ch8-ch11)
pch_dma: Fix CTL register access issue
Vinod Koul (3):
Merge remote branch 'gpio/ep93xx-dma' into next
dmaengine: pl08x: handle the rest of enums in pl08x_width
Merge branch 'next' into for-linus-3.0
om prakash (1):
dmaengine/ste_dma40: fix missing kernel-doc
Documentation/dmaengine.txt | 234 +++--
Documentation/spi/ep93xx_spi | 10 +
arch/arm/mach-ep93xx/Makefile | 4 +-
arch/arm/mach-ep93xx/core.c | 6 +-
arch/arm/mach-ep93xx/dma-m2p.c | 411 -------
arch/arm/mach-ep93xx/dma.c | 108 ++
arch/arm/mach-ep93xx/include/mach/dma.h | 190 ++---
arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h | 2 +
drivers/dma/Kconfig | 7 +
drivers/dma/Makefile | 1 +
drivers/dma/TODO | 1 -
drivers/dma/amba-pl08x.c | 246 +++---
drivers/dma/at_hdmac.c | 4 +-
drivers/dma/coh901318.c | 19 +-
drivers/dma/dmaengine.c | 4 +-
drivers/dma/ep93xx_dma.c | 1355
++++++++++++++++++++++++
drivers/dma/imx-sdma.c | 4 +-
drivers/dma/intel_mid_dma.c | 2 -
drivers/dma/ipu/ipu_idmac.c | 6 +-
drivers/dma/mv_xor.c | 4 +-
drivers/dma/mxs-dma.c | 13 +-
drivers/dma/pch_dma.c | 127 ++-
drivers/dma/pl330.c | 64 +-
drivers/dma/ste_dma40.c | 270 +++--
drivers/dma/ste_dma40_ll.h | 3 -
drivers/spi/ep93xx_spi.c | 303 +++++-
include/linux/amba/pl08x.h | 9 +-
sound/soc/ep93xx/ep93xx-ac97.c | 4 +-
sound/soc/ep93xx/ep93xx-i2s.c | 4 +-
sound/soc/ep93xx/ep93xx-pcm.c | 137 ++--
30 files changed, 2541 insertions(+), 1011 deletions(-)
delete mode 100644 arch/arm/mach-ep93xx/dma-m2p.c
create mode 100644 arch/arm/mach-ep93xx/dma.c
create mode 100644 drivers/dma/ep93xx_dma.c
--
~Vinod
ÿôèº{.nÇ+·®+%Ëÿ±éݶ\x17¥wÿº{.nÇ+·¥{±þG«éÿ{ayº\x1dÊÚë,j\a¢f£¢·hïêÿêçz_è®\x03(éÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?¨èÚ&£ø§~á¶iOæ¬z·vØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?I¥
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2014-04-09 16:21 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-20 3:46 [GIT PULL] slave-dmaengine updates Vinod Koul
-- strict thread matches above, loose matches on Subject: below --
2014-04-09 16:12 Vinod Koul
2013-07-07 4:17 Vinod Koul
2013-07-07 21:39 ` Linus Torvalds
2013-07-08 2:02 ` Vinod Koul
2013-05-08 2:47 Vinod Koul
2013-02-22 4:32 Vinod Koul
2012-01-16 15:06 Vinod Koul
2012-01-18 2:41 ` Linus Torvalds
2012-01-18 20:03 ` Vinod Koul
2011-10-31 4:40 Vinod Koul
2011-08-01 10:43 Koul, Vinod
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).