Commit 68ded1dc authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/mtk' into for-linus

parents 23a1bff7 b1f01e48
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -11,3 +11,16 @@ config MTK_HSDMA
	  This controller provides the channels which is dedicated to
	  memory-to-memory transfer to offload from CPU through ring-
	  based descriptor management.

config MTK_CQDMA
	tristate "MediaTek Command-Queue DMA controller support"
	depends on ARCH_MEDIATEK || COMPILE_TEST
	select DMA_ENGINE
	select DMA_VIRTUAL_CHANNELS
	select ASYNC_TX_ENABLE_CHANNEL_SWITCH
	help
	  Enable support for Command-Queue DMA controller on MediaTek
	  SoCs.

	  This controller provides the channels which is dedicated to
	  memory-to-memory transfer to offload from CPU.
+1 −0
Original line number Diff line number Diff line
obj-$(CONFIG_MTK_HSDMA) += mtk-hsdma.o
obj-$(CONFIG_MTK_CQDMA) += mtk-cqdma.o
+951 −0

File added.

Preview size limit exceeded, changes collapsed.