Skip to contentSkip to conversation

dma: sh: add Kconfig

PATCH In review Shimoda, Yoshihiro 3 participants 3 messages Apr 23, 2013 – Apr 30, 2013

Subsystems (2)
SuperH dmaengine
lore
Share & tools
lore

Shimoda, Yoshihiro

author
#0 lore raw

PATCH v8 1/2 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 <[email protected]>

---
about v8:
- add a new config "SH_DMAE_BASE".
- the original config "SH_DMAE" depends on "SH_DMAE_BASE".

 drivers/dma/Kconfig     |   10 +---------
 drivers/dma/Makefile    |    2 +-
 drivers/dma/sh/Kconfig  |   18 ++++++++++++++++++
 drivers/dma/sh/Makefile |    2 +-
 4 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 drivers/dma/sh/Kconfig
drivers/dma/Kconfig +1 -9
index afe5b19..e992489 100644
@@ -172,15 +172,7 @@ config TEGRA20_APB_DMA
 	  This DMA controller transfers data from memory to peripheral fifo
 	  or vice versa. It does not support memory to memory data transfer.
 
-
-
-config SH_DMAE
-	tristate "Renesas SuperH DMAC support"
-	depends on (SUPERH && SH_DMA) || (ARM && ARCH_SHMOBILE)
-	depends on !SH_DMA_API
-	select DMA_ENGINE
-	help
-	  Enable support for the Renesas SuperH DMA controllers.
+source "drivers/dma/sh/Kconfig"
 
 config COH901318
 	bool "ST-Ericsson COH901318 DMA support"
drivers/dma/Makefile +1 -1
index 268e626..a2b0df5 100644
@@ -19,7 +19,7 @@ obj-$(CONFIG_DW_DMAC) += dw_dmac.o
 obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
 obj-$(CONFIG_MX3_IPU) += ipu/
 obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
-obj-$(CONFIG_SH_DMAE) += sh/
+obj-$(CONFIG_SH_DMAE_BASE) += sh/
 obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o
 obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/
 obj-$(CONFIG_IMX_SDMA) += imx-sdma.o
drivers/dma/sh/Kconfig new file +18 -0
new file mode 100644
index 0000000..2407998
@@ -0,0 +1,18 @@
+#
+# DMA engine configuration for sh
+#
+
+config SH_DMAE_BASE
+	bool "Renesas SuperH DMA Engine support"
+	depends on (SUPERH && SH_DMA) || (ARM && ARCH_SHMOBILE)
+	depends on !SH_DMA_API
+	default y
+	select DMA_ENGINE
+	help
+	  Enable support for the Renesas SuperH DMA Engine.
+
+config SH_DMAE
+	tristate "Renesas SuperH DMAC support"
+	depends on SH_DMAE_BASE
+	help
+	  Enable support for the Renesas SuperH DMA controllers.
drivers/dma/sh/Makefile +1 -1
index 54ae957..eceaf46 100644
@@ -1,2 +1,2 @@
-obj-$(CONFIG_SH_DMAE) += shdma-base.o
+obj-$(CONFIG_SH_DMAE_BASE) += shdma-base.o
 obj-$(CONFIG_SH_DMAE) += shdma.o
Signature · 1 line
1.7.1
Acked-by on v8 1/2
#1 lore raw

Hi

Quoted 7 lines

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 <[email protected]>

---

Acked-by Kuninori Morimoto <[email protected]>
Quoted 83 lines

about v8:
- add a new config "SH_DMAE_BASE".
- the original config "SH_DMAE" depends on "SH_DMAE_BASE".

 drivers/dma/Kconfig     |   10 +---------
 drivers/dma/Makefile    |    2 +-
 drivers/dma/sh/Kconfig  |   18 ++++++++++++++++++
 drivers/dma/sh/Makefile |    2 +-
 4 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 drivers/dma/sh/Kconfig
drivers/dma/Kconfig +1 -9
index afe5b19..e992489 100644
@@ -172,15 +172,7 @@ config TEGRA20_APB_DMA
 	  This DMA controller transfers data from memory to peripheral fifo
 	  or vice versa. It does not support memory to memory data transfer.
 
-
-
-config SH_DMAE
-	tristate "Renesas SuperH DMAC support"
-	depends on (SUPERH && SH_DMA) || (ARM && ARCH_SHMOBILE)
-	depends on !SH_DMA_API
-	select DMA_ENGINE
-	help
-	  Enable support for the Renesas SuperH DMA controllers.
+source "drivers/dma/sh/Kconfig"
 
 config COH901318
 	bool "ST-Ericsson COH901318 DMA support"
drivers/dma/Makefile +1 -1
index 268e626..a2b0df5 100644
@@ -19,7 +19,7 @@ obj-$(CONFIG_DW_DMAC) += dw_dmac.o
 obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
 obj-$(CONFIG_MX3_IPU) += ipu/
 obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
-obj-$(CONFIG_SH_DMAE) += sh/
+obj-$(CONFIG_SH_DMAE_BASE) += sh/
 obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o
 obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/
 obj-$(CONFIG_IMX_SDMA) += imx-sdma.o
drivers/dma/sh/Kconfig new file +18 -0
new file mode 100644
index 0000000..2407998
@@ -0,0 +1,18 @@
+#
+# DMA engine configuration for sh
+#
+
+config SH_DMAE_BASE
+	bool "Renesas SuperH DMA Engine support"
+	depends on (SUPERH && SH_DMA) || (ARM && ARCH_SHMOBILE)
+	depends on !SH_DMA_API
+	default y
+	select DMA_ENGINE
+	help
+	  Enable support for the Renesas SuperH DMA Engine.
+
+config SH_DMAE
+	tristate "Renesas SuperH DMAC support"
+	depends on SH_DMAE_BASE
+	help
+	  Enable support for the Renesas SuperH DMA controllers.
drivers/dma/sh/Makefile +1 -1
index 54ae957..eceaf46 100644
@@ -1,2 +1,2 @@
-obj-$(CONFIG_SH_DMAE) += shdma-base.o
+obj-$(CONFIG_SH_DMAE_BASE) += shdma-base.o
 obj-$(CONFIG_SH_DMAE) += shdma.o
Signature · 5 lines
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Best regards
---
Kuninori Morimoto

#2 lore raw
In reply to Shimoda, Yoshihiro
Quoted 6 lines · Yoshihiro

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 <[email protected]>

Applied, both with checkpath fix for
WARNING: please, no space before tabs
#661: FILE: drivers/dma/sh/sudmac.c:416:
+^I.driver ^I= {$

You _should_ run checkpatch _always_ before sending the patches

--
~Vinod