Web lists-archives.com

[PATCH v2 1/2] Move ralink-gdma to its own directory




From: George Hilliard <thirtythreeforty@xxxxxxxxx>

This is in preparation to allow it and the mt7621-dma drivers to be
built separately.  They are completely independent pieces of software,
and the Kconfig specifies very different requirements.

Cc: linux-kernel@xxxxxxxxxxxxxxx
Cc: devel@xxxxxxxxxxxxxxxxxxxx
Cc: Neil Brown <neil@xxxxxxxxxx>
Signed-off-by: George Hilliard <thirtythreeforty@xxxxxxxxx>
---
 drivers/staging/Kconfig                                   | 2 ++
 drivers/staging/Makefile                                  | 1 +
 drivers/staging/mt7621-dma/Kconfig                        | 6 ------
 drivers/staging/mt7621-dma/Makefile                       | 1 -
 drivers/staging/ralink-gdma/Kconfig                       | 6 ++++++
 drivers/staging/ralink-gdma/Makefile                      | 3 +++
 drivers/staging/{mt7621-dma => ralink-gdma}/ralink-gdma.c | 0
 7 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 drivers/staging/ralink-gdma/Kconfig
 create mode 100644 drivers/staging/ralink-gdma/Makefile
 rename drivers/staging/{mt7621-dma => ralink-gdma}/ralink-gdma.c (100%)

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index e4f608815c05..b4cfde38e856 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -110,6 +110,8 @@ source "drivers/staging/mt7621-spi/Kconfig"
 
 source "drivers/staging/mt7621-dma/Kconfig"
 
+source "drivers/staging/ralink-gdma/Kconfig"
+
 source "drivers/staging/mt7621-mmc/Kconfig"
 
 source "drivers/staging/mt7621-eth/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 5868631e8f1b..e095f427177c 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -45,6 +45,7 @@ obj-$(CONFIG_SOC_MT7621)	+= mt7621-pci/
 obj-$(CONFIG_SOC_MT7621)	+= mt7621-pinctrl/
 obj-$(CONFIG_SOC_MT7621)	+= mt7621-spi/
 obj-$(CONFIG_SOC_MT7621)	+= mt7621-dma/
+obj-$(CONFIG_SOC_MT7621)	+= ralink-gdma/
 obj-$(CONFIG_SOC_MT7621)	+= mt7621-mmc/
 obj-$(CONFIG_SOC_MT7621)	+= mt7621-eth/
 obj-$(CONFIG_SOC_MT7621)	+= mt7621-dts/
diff --git a/drivers/staging/mt7621-dma/Kconfig b/drivers/staging/mt7621-dma/Kconfig
index 2423c40099d1..b6e48a682c44 100644
--- a/drivers/staging/mt7621-dma/Kconfig
+++ b/drivers/staging/mt7621-dma/Kconfig
@@ -1,9 +1,3 @@
-config DMA_RALINK
-	tristate "RALINK DMA support"
-	depends on RALINK && !SOC_RT288X
-	select DMA_ENGINE
-	select DMA_VIRTUAL_CHANNELS
-
 config MTK_HSDMA
 	tristate "MTK HSDMA support"
 	depends on RALINK && SOC_MT7621
diff --git a/drivers/staging/mt7621-dma/Makefile b/drivers/staging/mt7621-dma/Makefile
index d3152d45cf45..c9e3e1619ab0 100644
--- a/drivers/staging/mt7621-dma/Makefile
+++ b/drivers/staging/mt7621-dma/Makefile
@@ -1,4 +1,3 @@
-obj-$(CONFIG_DMA_RALINK) += ralink-gdma.o
 obj-$(CONFIG_MTK_HSDMA) += mtk-hsdma.o
 
 ccflags-y += -I$(srctree)/drivers/dma
diff --git a/drivers/staging/ralink-gdma/Kconfig b/drivers/staging/ralink-gdma/Kconfig
new file mode 100644
index 000000000000..a12b2c672d48
--- /dev/null
+++ b/drivers/staging/ralink-gdma/Kconfig
@@ -0,0 +1,6 @@
+config DMA_RALINK
+	tristate "RALINK DMA support"
+	depends on RALINK && !SOC_RT288X
+	select DMA_ENGINE
+	select DMA_VIRTUAL_CHANNELS
+
diff --git a/drivers/staging/ralink-gdma/Makefile b/drivers/staging/ralink-gdma/Makefile
new file mode 100644
index 000000000000..5d917e0729bb
--- /dev/null
+++ b/drivers/staging/ralink-gdma/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_DMA_RALINK) += ralink-gdma.o
+
+ccflags-y += -I$(srctree)/drivers/dma
diff --git a/drivers/staging/mt7621-dma/ralink-gdma.c b/drivers/staging/ralink-gdma/ralink-gdma.c
similarity index 100%
rename from drivers/staging/mt7621-dma/ralink-gdma.c
rename to drivers/staging/ralink-gdma/ralink-gdma.c
-- 
2.20.1