Merge branch 'topic/k3' into for-linus

850e0448 · Vinod Koul · ed58a112 · 5f03c399 · 850e0448 · 850e0448
Commit 850e0448 authored Oct 03, 2016 by Vinod Koul
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 179 additions and 38 deletions

drivers/dma/Kconfig drivers/dma/Kconfig +1 -1

drivers/dma/k3dma.c drivers/dma/k3dma.c +178 -37

No files found.
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -278,7 +278,7 @@ config INTEL_MIC_X100_DMA

 config K3_DMA
 	tristate "Hisilicon K3 DMA support"
-	depends on ARCH_HI3xxx
+	depends on ARCH_HI3xxx || ARCH_HISI || COMPILE_TEST
 	select DMA_ENGINE
 	select DMA_VIRTUAL_CHANNELS
 	help

--- a/drivers/dma/k3dma.c
+++ b/drivers/dma/k3dma.c