Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / dma / sh / Kconfig

diff --git a/drivers/dma/sh/Kconfig b/drivers/dma/sh/Kconfig
index dadd9e0..0349125 100644 (file)
--- a/drivers/dma/sh/Kconfig
+++ b/drivers/dma/sh/Kconfig
@@ -2,21 +2,39 @@
 # DMA engine configuration for sh
 #
 
+#
+# DMA Engine Helpers
+#
+
 config SH_DMAE_BASE
        bool "Renesas SuperH DMA Engine support"
-       depends on (SUPERH && SH_DMA) || (ARM && ARCH_SHMOBILE)
+       depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
+       depends on !SUPERH || SH_DMA
        depends on !SH_DMA_API
        default y
        select DMA_ENGINE
        help
          Enable support for the Renesas SuperH DMA controllers.
 
+#
+# DMA Controllers
+#
+
 config SH_DMAE
        tristate "Renesas SuperH DMAC support"
        depends on SH_DMAE_BASE
        help
          Enable support for the Renesas SuperH DMA controllers.
 
+if SH_DMAE
+
+config SH_DMAE_R8A73A4
+       def_bool y
+       depends on ARCH_R8A73A4
+       depends on OF
+
+endif
+
 config SUDMAC
        tristate "Renesas SUDMAC support"
        depends on SH_DMAE_BASE
@@ -29,6 +47,8 @@ config RCAR_HPB_DMAE
        help
          Enable support for the Renesas R-Car series DMA controllers.
 
-config SHDMA_R8A73A4
-       def_bool y
-       depends on ARCH_R8A73A4 && SH_DMAE != n
+config RCAR_AUDMAC_PP
+       tristate "Renesas R-Car Audio DMAC Peripheral Peripheral support"
+       depends on SH_DMAE_BASE
+       help
+         Enable support for the Renesas R-Car Audio DMAC Peripheral Peripheral controllers.