Merge branch 'topic/altera' into for-linus

a431cbaf · Vinod Koul · a702e47e · 6084fc2e · a431cbaf · a431cbaf
Commit a431cbaf authored Sep 06, 2017 by Vinod Koul
Expand all Show whitespace changes
Inline Side-by-side

Showing with 934 additions and 0 deletions

drivers/dma/Kconfig drivers/dma/Kconfig +6 -0

drivers/dma/Makefile drivers/dma/Makefile +1 -0

drivers/dma/altera-msgdma.c drivers/dma/altera-msgdma.c +927 -0

No files found.
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -56,6 +56,12 @@ config DMA_OF
 	select DMA_ENGINE
 #devices
+config ALTERA_MSGDMA
+	tristate "Altera / Intel mSGDMA Engine"
+	select DMA_ENGINE
+	help
+	  Enable support for Altera / Intel mSGDMA controller.
 config AMBA_PL08X
 	bool "ARM PrimeCell PL080 or PL081 support"
 	depends on ARM_AMBA

--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_DMA_OF) += of-dma.o
 obj-$(CONFIG_DMATEST) += dmatest.o
 #devices
+obj-$(CONFIG_ALTERA_MSGDMA) += altera-msgdma.o
 obj-$(CONFIG_AMBA_PL08X) += amba-pl08x.o
 obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/
 obj-$(CONFIG_AT_HDMAC) += at_hdmac.o

--- a/drivers/dma/altera-msgdma.c
+++ b/drivers/dma/altera-msgdma.c