aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorShimoda, Yoshihiro <yoshihiro.shimoda.uh@renesas.com>2013-04-23 07:00:06 -0400
committerVinod Koul <vinod.koul@intel.com>2013-04-30 06:20:12 -0400
commit189b4ee8e9daf349db80f47b81edec67d223a953 (patch)
tree7063b7f6fb630b5e39c2d4047ff9d7c5395a34f5 /drivers/dma
parentbbe89c8e3d598129b728d1388c3ad9abe4e8e261 (diff)
dma: sh: add Kconfig
This patch adds Kconfig in the drivers/dma/sh. This patch also adds a new config "SH_DMAE_BASE" and the "config SH_DMAE" depends on it. Since some drivers (e.g. sh_mmcif.c) depends on shdma-base.c if CONFIG_DMA_ENGINE=y, the "config SH_DMAE_BASE" is set as "bool". Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/Kconfig10
-rw-r--r--drivers/dma/Makefile2
-rw-r--r--drivers/dma/sh/Kconfig18
-rw-r--r--drivers/dma/sh/Makefile2
4 files changed, 21 insertions, 11 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index afe5b1958382..e9924898043a 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -172,15 +172,7 @@ config TEGRA20_APB_DMA
172 This DMA controller transfers data from memory to peripheral fifo 172 This DMA controller transfers data from memory to peripheral fifo
173 or vice versa. It does not support memory to memory data transfer. 173 or vice versa. It does not support memory to memory data transfer.
174 174
175 175source "drivers/dma/sh/Kconfig"
176
177config SH_DMAE
178 tristate "Renesas SuperH DMAC support"
179 depends on (SUPERH && SH_DMA) || (ARM && ARCH_SHMOBILE)
180 depends on !SH_DMA_API
181 select DMA_ENGINE
182 help
183 Enable support for the Renesas SuperH DMA controllers.
184 176
185config COH901318 177config COH901318
186 bool "ST-Ericsson COH901318 DMA support" 178 bool "ST-Ericsson COH901318 DMA support"
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index 268e62634bca..a2b0df591f95 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -19,7 +19,7 @@ obj-$(CONFIG_DW_DMAC) += dw_dmac.o
19obj-$(CONFIG_AT_HDMAC) += at_hdmac.o 19obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
20obj-$(CONFIG_MX3_IPU) += ipu/ 20obj-$(CONFIG_MX3_IPU) += ipu/
21obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o 21obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
22obj-$(CONFIG_SH_DMAE) += sh/ 22obj-$(CONFIG_SH_DMAE_BASE) += sh/
23obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o 23obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o
24obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/ 24obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/
25obj-$(CONFIG_IMX_SDMA) += imx-sdma.o 25obj-$(CONFIG_IMX_SDMA) += imx-sdma.o
diff --git a/drivers/dma/sh/Kconfig b/drivers/dma/sh/Kconfig
new file mode 100644
index 000000000000..c0f7a3763f3d
--- /dev/null
+++ b/drivers/dma/sh/Kconfig
@@ -0,0 +1,18 @@
1#
2# DMA engine configuration for sh
3#
4
5config SH_DMAE_BASE
6 bool "Renesas SuperH DMA Engine support"
7 depends on (SUPERH && SH_DMA) || (ARM && ARCH_SHMOBILE)
8 depends on !SH_DMA_API
9 default y
10 select DMA_ENGINE
11 help
12 Enable support for the Renesas SuperH DMA controllers.
13
14config SH_DMAE
15 tristate "Renesas SuperH DMAC support"
16 depends on SH_DMAE_BASE
17 help
18 Enable support for the Renesas SuperH DMA controllers.
diff --git a/drivers/dma/sh/Makefile b/drivers/dma/sh/Makefile
index 54ae9572b0ac..eceaf469f5e3 100644
--- a/drivers/dma/sh/Makefile
+++ b/drivers/dma/sh/Makefile
@@ -1,2 +1,2 @@
1obj-$(CONFIG_SH_DMAE) += shdma-base.o 1obj-$(CONFIG_SH_DMAE_BASE) += shdma-base.o
2obj-$(CONFIG_SH_DMAE) += shdma.o 2obj-$(CONFIG_SH_DMAE) += shdma.o