Commit 2996148a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dmaengine-4.18-rc1' of git://git.infradead.org/users/vkoul/slave-dma 

Pull dmaengine updates from Vinod Koul:

 - updates to sprd, bam_dma, stm drivers

 - remove VLAs in dmatest

 - move TI drivers to their own subdir

 - switch to SPDX tags for ima/mxs dma drivers

 - simplify getting .drvdata on bunch of drivers by Wolfram Sang

* tag 'dmaengine-4.18-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (32 commits)
  dmaengine: sprd: Add Spreadtrum DMA configuration
  dmaengine: sprd: Optimize the sprd_dma_prep_dma_memcpy()
  dmaengine: imx-dma: Switch to SPDX identifier
  dmaengine: mxs-dma: Switch to SPDX identifier
  dmaengine: imx-sdma: Switch to SPDX identifier
  dmaengine: usb-dmac: Document R8A7799{0,5} bindings
  dmaengine: qcom: bam_dma: fix some doc warnings.
  dmaengine: qcom: bam_dma: fix invalid assignment warning
  dmaengine: sprd: fix an NULL vs IS_ERR() bug
  dmaengine: sprd: Use devm_ioremap_resource() to map memory
  dmaengine: sprd: Fix potential NULL dereference in sprd_dma_probe()
  dmaengine: pl330: flush before wait, and add dev burst support.
  dmaengine: axi-dmac: Request IRQ with IRQF_SHARED
  dmaengine: stm32-mdma: fix spelling mistake: "avalaible" -> "available"
  dmaengine: rcar-dmac: Document R-Car D3 bindings
  dmaengine: sprd: Move DMA request mode and interrupt type into head file
  dmaengine: sprd: Define the DMA data width type
  dmaengine: sprd: Define the DMA transfer step type
  dmaengine: ti: New directory for Texas Instruments DMA drivers
  dmaengine: shdmac: Change platform check to CONFIG_ARCH_RENESAS
  ...
parents 18f18376 67f31971

Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ Required Properties: 
		- "renesas,dmac-r8a77965" (R-Car M3-N)

		- "renesas,dmac-r8a77970" (R-Car V3M)

		- "renesas,dmac-r8a77980" (R-Car V3H)

		- "renesas,dmac-r8a77995" (R-Car D3)



- reg: base address and length of the registers block for the DMAC

Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ Required Properties: 
	  - "renesas,r8a7795-usb-dmac" (R-Car H3)

	  - "renesas,r8a7796-usb-dmac" (R-Car M3-W)

	  - "renesas,r8a77965-usb-dmac" (R-Car M3-N)

	  - "renesas,r8a77990-usb-dmac" (R-Car E3)

	  - "renesas,r8a77995-usb-dmac" (R-Car D3)

- reg: base address and length of the registers block for the DMAC

- interrupts: interrupt specifiers for the DMAC, one for each entry in

  interrupt-names.

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -11790,6 +11790,14 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.g 
S:	Supported

F:	arch/hexagon/



QUALCOMM HIDMA DRIVER

M:	Sinan Kaya <okaya@codeaurora.org>

L:	linux-arm-kernel@lists.infradead.org

L:	linux-arm-msm@vger.kernel.org

L:	dmaengine@vger.kernel.org

S:	Supported

F:	drivers/dma/qcom/hidma*



QUALCOMM IOMMU

M:	Rob Clark <robdclark@gmail.com>

L:	iommu@lists.linux-foundation.org

drivers/dma/Kconfig

+2 −29
Original line number Diff line number Diff line
@@ -151,13 +151,6 @@ config DMA_JZ4780 
	  If you have a board based on such a SoC and wish to use DMA for

	  devices which can use the DMA controller, say Y or M here.



config DMA_OMAP

	tristate "OMAP DMA support"

	depends on ARCH_OMAP || COMPILE_TEST

	select DMA_ENGINE

	select DMA_VIRTUAL_CHANNELS

	select TI_DMA_CROSSBAR if (SOC_DRA7XX || COMPILE_TEST)



config DMA_SA11X0

	tristate "SA-11x0 DMA support"

	depends on ARCH_SA1100 || COMPILE_TEST
@@ -574,28 +567,6 @@ config TIMB_DMA 
	help

	  Enable support for the Timberdale FPGA DMA engine.



config TI_CPPI41

	tristate "CPPI 4.1 DMA support"

	depends on (ARCH_OMAP || ARCH_DAVINCI_DA8XX)

	select DMA_ENGINE

	help

	  The Communications Port Programming Interface (CPPI) 4.1 DMA engine

	  is currently used by the USB driver on AM335x and DA8xx platforms.



config TI_DMA_CROSSBAR

	bool



config TI_EDMA

	bool "TI EDMA support"

	depends on ARCH_DAVINCI || ARCH_OMAP || ARCH_KEYSTONE || COMPILE_TEST

	select DMA_ENGINE

	select DMA_VIRTUAL_CHANNELS

	select TI_DMA_CROSSBAR if (ARCH_OMAP || COMPILE_TEST)

	default n

	help

	  Enable support for the TI EDMA controller. This DMA

	  engine is found on TI DaVinci and AM33xx parts.



config XGENE_DMA

	tristate "APM X-Gene DMA support"

	depends on ARCH_XGENE || COMPILE_TEST
@@ -653,6 +624,8 @@ source "drivers/dma/hsu/Kconfig" 


source "drivers/dma/sh/Kconfig"



source "drivers/dma/ti/Kconfig"



# clients

comment "DMA Clients"

	depends on DMA_ENGINE

drivers/dma/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o 
obj-$(CONFIG_DMA_BCM2835) += bcm2835-dma.o

obj-$(CONFIG_DMA_JZ4740) += dma-jz4740.o

obj-$(CONFIG_DMA_JZ4780) += dma-jz4780.o

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

obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o

obj-$(CONFIG_DMA_SUN4I) += sun4i-dma.o

obj-$(CONFIG_DMA_SUN6I) += sun6i-dma.o
@@ -69,13 +68,11 @@ obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o 
obj-$(CONFIG_TEGRA20_APB_DMA) += tegra20-apb-dma.o

obj-$(CONFIG_TEGRA210_ADMA) += tegra210-adma.o

obj-$(CONFIG_TIMB_DMA) += timb_dma.o

obj-$(CONFIG_TI_CPPI41) += cppi41.o

obj-$(CONFIG_TI_DMA_CROSSBAR) += ti-dma-crossbar.o

obj-$(CONFIG_TI_EDMA) += edma.o

obj-$(CONFIG_XGENE_DMA) += xgene-dma.o

obj-$(CONFIG_ZX_DMA) += zx_dma.o

obj-$(CONFIG_ST_FDMA) += st_fdma.o



obj-y += mediatek/

obj-y += qcom/

obj-y += ti/

obj-y += xilinx/

CRA Git | Maintained and supported by SUSTech CRA and CCSE