Commit b7e97d22 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 

Pull slave-dmaengine updates from Vinod Koul:
 "This time we have Andy updates on dw_dmac which is attempting to make
  this IP block available as PCI and platform device though not fully
  complete this time.

  We also have TI EDMA moving the dma driver to use dmaengine APIs, also
  have a new driver for mmp-tdma, along with bunch of small updates.

  Now for your excitement the merge is little unusual here, while
  merging the auto merge on linux-next picks wrong choice for pl330
  (drivers/dma/pl330.c) and this causes build failure.  The correct
  resolution is in linux-next.  (DMA: PL330: Fix build error) I didn't
  back merge your tree this time as you are better than me so no point
  in doing that for me :)"

Fixed the pl330 conflict as in linux-next, along with trivial header
file conflicts due to changed includes.

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (29 commits)
  dma: tegra: fix interrupt name issue with apb dma.
  dw_dmac: fix a regression in dwc_prep_dma_memcpy
  dw_dmac: introduce software emulation of LLP transfers
  dw_dmac: autoconfigure data_width or get it via platform data
  dw_dmac: autoconfigure block_size or use platform data
  dw_dmac: get number of channels from hardware if possible
  dw_dmac: fill optional encoded parameters in register structure
  dw_dmac: mark dwc_dump_chan_regs as inline
  DMA: PL330: return ENOMEM instead of 0 from pl330_alloc_chan_resources
  DMA: PL330: Remove redundant runtime_suspend/resume functions
  DMA: PL330: Remove controller clock enable/disable
  dmaengine: use kmem_cache_zalloc instead of kmem_cache_alloc/memset
  DMA: PL330: Set the capability of pdm0 and pdm1 as DMA_PRIVATE
  ARM: EXYNOS: Set the capability of pdm0 and pdm1 as DMA_PRIVATE
  dma: tegra: use list_move_tail instead of list_del/list_add_tail
  mxs/dma: Enlarge the CCW descriptor area to 4 pages
  dw_dmac: utilize slave_id to pass request line
  dmaengine: mmp_tdma: add dt support
  dmaengine: mmp-pdma support
  spi: davici - make davinci select edma
  ...
parents 943c2ace d0fc9054

arch/arm/mach-exynos/dma.c

+2 −0
Original line number Diff line number Diff line
@@ -303,10 +303,12 @@ static int __init exynos_dma_init(void) 


	dma_cap_set(DMA_SLAVE, exynos_pdma0_pdata.cap_mask);

	dma_cap_set(DMA_CYCLIC, exynos_pdma0_pdata.cap_mask);

	dma_cap_set(DMA_PRIVATE, exynos_pdma0_pdata.cap_mask);

	amba_device_register(&exynos_pdma0_device, &iomem_resource);



	dma_cap_set(DMA_SLAVE, exynos_pdma1_pdata.cap_mask);

	dma_cap_set(DMA_CYCLIC, exynos_pdma1_pdata.cap_mask);

	dma_cap_set(DMA_PRIVATE, exynos_pdma1_pdata.cap_mask);

	amba_device_register(&exynos_pdma1_device, &iomem_resource);



	dma_cap_set(DMA_MEMCPY, exynos_mdma1_pdata.cap_mask);

arch/arm/mach-spear13xx/spear13xx.c

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ struct dw_dma_platform_data dmac_plat_data = { 
	.nr_channels = 8,

	.chan_allocation_order = CHAN_ALLOCATION_DESCENDING,

	.chan_priority = CHAN_PRIORITY_DESCENDING,

	.block_size = 4095U,

	.nr_masters = 2,

	.data_width = { 3, 3, 0, 0 },

};



void __init spear13xx_l2x0_init(void)

arch/avr32/mach-at32ap/at32ap700x.c

+3 −0
Original line number Diff line number Diff line
@@ -605,6 +605,9 @@ static void __init genclk_init_parent(struct clk *clk) 


static struct dw_dma_platform_data dw_dmac0_data = {

	.nr_channels	= 3,

	.block_size	= 4095U,

	.nr_masters	= 2,

	.data_width	= { 2, 2, 0, 0 },

};



static struct resource dw_dmac0_resource[] = {

drivers/dma/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -208,6 +208,16 @@ config SIRF_DMA 
	help

	  Enable support for the CSR SiRFprimaII DMA engine.



config TI_EDMA

	tristate "TI EDMA support"

	depends on ARCH_DAVINCI

	select DMA_ENGINE

	select DMA_VIRTUAL_CHANNELS

	default n

	help

	  Enable support for the TI EDMA controller. This DMA

	  engine is found on TI DaVinci and AM33xx parts.



config ARCH_HAS_ASYNC_TX_FIND_CHANNEL

	bool
@@ -292,6 +302,13 @@ config DMA_OMAP 
	select DMA_ENGINE

	select DMA_VIRTUAL_CHANNELS



config MMP_PDMA

	bool "MMP PDMA support"

	depends on (ARCH_MMP || ARCH_PXA)

	select DMA_ENGINE

	help

	  Support the MMP PDMA engine for PXA and MMP platfrom.



config DMA_ENGINE

	bool

drivers/dma/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ obj-$(CONFIG_IMX_DMA) += imx-dma.o 
obj-$(CONFIG_MXS_DMA) += mxs-dma.o

obj-$(CONFIG_TIMB_DMA) += timb_dma.o

obj-$(CONFIG_SIRF_DMA) += sirf-dma.o

obj-$(CONFIG_TI_EDMA) += edma.o

obj-$(CONFIG_STE_DMA40) += ste_dma40.o ste_dma40_ll.o

obj-$(CONFIG_TEGRA20_APB_DMA) += tegra20-apb-dma.o

obj-$(CONFIG_PL330_DMA) += pl330.o
@@ -32,3 +33,4 @@ obj-$(CONFIG_EP93XX_DMA) += ep93xx_dma.o 
obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o

obj-$(CONFIG_MMP_TDMA) += mmp_tdma.o

obj-$(CONFIG_DMA_OMAP) += omap-dma.o

obj-$(CONFIG_MMP_PDMA) += mmp_pdma.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE