staging: Move ralink-gdma to its own directory

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@vger.kernel.org
Cc: devel@driverdev.osuosl.org
Cc: Neil Brown <neil@brown.name>
Signed-off-by: George Hilliard <thirtythreeforty@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 4a3d6e0..46af55a 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -112,6 +112,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 413890d..4d563ed 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -46,6 +46,7 @@ obj-$(CONFIG_SOC_MT7621)      += mt7621-pci-phy/
 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 2423c40..b6e48a6 100644 (file)
--- 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 d3152d4..c9e3e16 100644 (file)
--- 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 (file)
index 0000000..a12b2c6
--- /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 (file)
index 0000000..5d917e0
--- /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