Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46c2eb64 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/rcar' into for-linus

parents 2cd6f792 ee4b876b

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

+0 −3
Original line number Diff line number Diff line
@@ -5,9 +5,6 @@ controller instances named DMAC capable of serving multiple clients. Channels 
can be dedicated to specific clients or shared between a large number of

clients.



DMA clients are connected to the DMAC ports referenced by an 8-bit identifier

called MID/RID.



Each DMA client is connected to one dedicated port of the DMAC, identified by

an 8-bit port number called the MID/RID. A DMA controller can thus serve up to

256 clients in total. When the number of hardware channels is lower than the

drivers/dma/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ obj-$(CONFIG_AT_HDMAC) += at_hdmac.o 
obj-$(CONFIG_AT_XDMAC) += at_xdmac.o

obj-$(CONFIG_MX3_IPU) += ipu/

obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o

obj-$(CONFIG_SH_DMAE_BASE) += sh/

obj-$(CONFIG_RENESAS_DMA) += sh/

obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o

obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/

obj-$(CONFIG_IMX_SDMA) += imx-sdma.o

drivers/dma/sh/Kconfig

+13 −1
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
# DMA engine configuration for sh

#



config RENESAS_DMA

	bool

	select DMA_ENGINE



#

# DMA Engine Helpers

#
@@ -12,7 +16,7 @@ config SH_DMAE_BASE 
	depends on !SUPERH || SH_DMA

	depends on !SH_DMA_API

	default y

	select DMA_ENGINE

	select RENESAS_DMA

	help

	  Enable support for the Renesas SuperH DMA controllers.
@@ -52,3 +56,11 @@ config RCAR_AUDMAC_PP 
	depends on SH_DMAE_BASE

	help

	  Enable support for the Renesas R-Car Audio DMAC Peripheral Peripheral controllers.



config RCAR_DMAC

	tristate "Renesas R-Car Gen2 DMA Controller"

	depends on ARCH_SHMOBILE || COMPILE_TEST

	select RENESAS_DMA

	help

	  This driver supports the general purpose DMA controller found in the

	  Renesas R-Car second generation SoCs.

drivers/dma/sh/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -16,3 +16,4 @@ obj-$(CONFIG_SH_DMAE) += shdma.o 
obj-$(CONFIG_SUDMAC) += sudmac.o

obj-$(CONFIG_RCAR_HPB_DMAE) += rcar-hpbdma.o

obj-$(CONFIG_RCAR_AUDMAC_PP) += rcar-audmapp.o

obj-$(CONFIG_RCAR_DMAC) += rcar-dmac.o