Commit e1288cd7 authored Jan 17, 2011 by Linus Torvalds

async_tx

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (63 commits)
  ARM: PL08x: cleanup comments
  Update CONFIG_MD_RAID6_PQ to CONFIG_RAID6_PQ in drivers/dma/iop-adma.c
  ARM: PL08x: fix a warning
  Fix dmaengine_submit() return type
  dmaengine: at_hdmac: fix race while monitoring channel status
  dmaengine: at_hdmac: flags located in first descriptor
  dmaengine: at_hdmac: use subsys_initcall instead of module_init
  dmaengine: at_hdmac: no need set ACK in new descriptor
  dmaengine: at_hdmac: trivial add precision to unmapping comment
  dmaengine: at_hdmac: use dma_address to program DMA hardware
  pch_dma: support new device ML7213 IOH
  ARM: PL08x: prevent dma_set_runtime_config() reconfiguring memcpy channels
  ARM: PL08x: allow dma_set_runtime_config() to return errors
  ARM: PL08x: fix locking between prepare function and submit function
  ARM: PL08x: introduce 'phychan_hold' to hold on to physical channels
  ARM: PL08x: put txd's on the pending list in pl08x_tx_submit()
  ARM: PL08x: rename 'desc_list' as 'pend_list'
  ARM: PL08x: implement unmapping of memcpy buffers
  ARM: PL08x: store prep_* flags in async_tx structure
  ARM: PL08x: shrink srcbus/dstbus in txd structure
  ...

parents e78bf5e6 94ae8522

arch/arm/plat-nomadik/include/plat/ste_dma40.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,14 @@
		#include <linux/workqueue.h>
		#include <linux/interrupt.h>

		/*
		* Maxium size for a single dma descriptor
		* Size is limited to 16 bits.
		* Size is in the units of addr-widths (1,2,4,8 bytes)
		* Larger transfers will be split up to multiple linked desc
		*/
		#define STEDMA40_MAX_SEG_SIZE 0xFFFF

		/* dev types for memcpy */
		#define STEDMA40_DEV_DST_MEMORY (-1)
		#define STEDMA40_DEV_SRC_MEMORY (-1)

drivers/dma/Kconfig

+7 −2

Original line number	Diff line number	Diff line
		@@ -200,11 +200,16 @@ config PL330_DMA
		platform_data for a dma-pl330 device.

		config PCH_DMA
		tristate "Topcliff (Intel EG20T) PCH DMA support"
		tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7213 IOH DMA support"
		depends on PCI && X86
		select DMA_ENGINE
		help
		Enable support for the Topcliff (Intel EG20T) PCH DMA engine.
		Enable support for Intel EG20T PCH DMA engine.

		This driver also can be used for OKI SEMICONDUCTOR ML7213 IOH(Input/
		Output Hub) which is for IVI(In-Vehicle Infotainment) use.
		ML7213 is companion chip for Intel Atom E6xx series.
		ML7213 is completely compatible for Intel EG20T PCH.

		config IMX_SDMA
		tristate "i.MX SDMA support"

Admin message