Skip to contentSkip to conversation

staging: mt7621-dma: remove dma related drivers from tree

PATCH New Sergio Paracuellos 1 participant 4 messages Nov 13, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover staging: mt7621-dma: remove dma related drivers from tree

Hi all,

A few weeks ago, I sent the following mail[0] to know if someone has interesent in mt7621 dma related drivers from staging. There was not response at all. There has not been interest at all for a while other than trivial style clean ups and AFAICT, these drivers are not normally used. ralink-gdma is used by 'i2s' but there is not mt7621 i2s in tree driver at all, so having this has no sense also. The other one mt7621-dma corresponds to mediatek hsdma controller. There is already a in tree driver from mediatek for this controller so in case mt7621 Soc also need this the way to go should be to work on the already mainlined driver. Because of these reasons, remove these two drivers from staging tree and properly update device tree include file to remove related nodes accordly.

Best regards,
Sergio Paracuellos

[0]: https://lkml.org/lkml/2021/10/25/59

Sergio Paracuellos (3):
staging: ralink-gdma: remove driver from tree
staging: mt7621-dma: remove driver from tree
staging: mt7621-dts: remove 'gdma' and 'hsdma' nodes

 drivers/staging/Kconfig                   |   4 -
 drivers/staging/Makefile                  |   2 -
 drivers/staging/mt7621-dma/Kconfig        |   7 -
 drivers/staging/mt7621-dma/Makefile       |   4 -
 drivers/staging/mt7621-dma/TODO           |   5 -
 drivers/staging/mt7621-dma/hsdma-mt7621.c | 758 ------------------
 drivers/staging/mt7621-dts/mt7621.dtsi    |  38 -
 drivers/staging/ralink-gdma/Kconfig       |   8 -
 drivers/staging/ralink-gdma/Makefile      |   4 -
 drivers/staging/ralink-gdma/ralink-gdma.c | 917 ----------------------
 10 files changed, 1747 deletions(-)
 delete mode 100644 drivers/staging/mt7621-dma/Kconfig
 delete mode 100644 drivers/staging/mt7621-dma/Makefile
 delete mode 100644 drivers/staging/mt7621-dma/TODO
 delete mode 100644 drivers/staging/mt7621-dma/hsdma-mt7621.c
 delete mode 100644 drivers/staging/ralink-gdma/Kconfig
 delete mode 100644 drivers/staging/ralink-gdma/Makefile
 delete mode 100644 drivers/staging/ralink-gdma/ralink-gdma.c
Signature · 1 line
2.33.0
#1 lore raw

PATCH 1/3 staging: ralink-gdma: remove driver from tree

This driver was a added a time ago and there is no special effort or work to clean it and any progress at all to mainline it. Also, the main user of this dma controller seems to be 'i2s' in mt7621 SoCs. There is no in-tree driver at all for the 'i2s' and its related device tree node has also been deleted from main device tree file. Hence, remove this driver also for completeness.

---
 drivers/staging/Kconfig                   |   2 -
 drivers/staging/Makefile                  |   1 -
 drivers/staging/ralink-gdma/Kconfig       |   8 -
 drivers/staging/ralink-gdma/Makefile      |   4 -
 drivers/staging/ralink-gdma/ralink-gdma.c | 917 ----------------------
 5 files changed, 932 deletions(-)
 delete mode 100644 drivers/staging/ralink-gdma/Kconfig
 delete mode 100644 drivers/staging/ralink-gdma/Makefile
 delete mode 100644 drivers/staging/ralink-gdma/ralink-gdma.c
drivers/staging/Kconfig +0 -2
index 59af251e7576..c7ab0210dc4b 100644
@@ -88,8 +88,6 @@ source "drivers/staging/pi433/Kconfig"
 
 source "drivers/staging/mt7621-dma/Kconfig"
 
-source "drivers/staging/ralink-gdma/Kconfig"
-
 source "drivers/staging/mt7621-dts/Kconfig"
 
 source "drivers/staging/axis-fifo/Kconfig"
drivers/staging/Makefile +0 -1
index 76f413470bc8..f1bee2a864ff 100644
@@ -34,7 +34,6 @@ obj-$(CONFIG_GREYBUS)		+= greybus/
 obj-$(CONFIG_BCM2835_VCHIQ)	+= vc04_services/
 obj-$(CONFIG_PI433)		+= pi433/
 obj-$(CONFIG_SOC_MT7621)	+= mt7621-dma/
-obj-$(CONFIG_DMA_RALINK)	+= ralink-gdma/
 obj-$(CONFIG_SOC_MT7621)	+= mt7621-dts/
 obj-$(CONFIG_XIL_AXIS_FIFO)	+= axis-fifo/
 obj-$(CONFIG_FIELDBUS_DEV)     += fieldbus/
drivers/staging/ralink-gdma/Kconfig deleted +0 -8
deleted file mode 100644
index 0017376234e2..000000000000
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-config DMA_RALINK
-	tristate "RALINK DMA support"
-	depends on RALINK && !SOC_RT288X
-	depends on DMADEVICES
-	select DMA_ENGINE
-	select DMA_VIRTUAL_CHANNELS
-
drivers/staging/ralink-gdma/Makefile deleted +0 -4
deleted file mode 100644
index 5c4566b2e405..000000000000
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_DMA_RALINK) += ralink-gdma.o
-
-ccflags-y += -I$(srctree)/drivers/dma
drivers/staging/ralink-gdma/ralink-gdma.c deleted +0 -917

917 lines not on this page · raw message

Signature · 1 line
2.33.0
#2 lore raw

PATCH 2/3 staging: mt7621-dma: remove driver from tree

In reply to Sergio Paracuellos

This driver was a added a time ago and there is no special effort or work to clean it and any progress at all to mainline it. Also, there is already a driver from Mediatek in 'drivers/dma/mediatek/mtk-hsdma.c' which looks pretty similar to this. So the way of supporting HSDMA for mt7621 would be to modify that driver instead.

---
 drivers/staging/Kconfig                   |   2 -
 drivers/staging/Makefile                  |   1 -
 drivers/staging/mt7621-dma/Kconfig        |   7 -
 drivers/staging/mt7621-dma/Makefile       |   4 -
 drivers/staging/mt7621-dma/TODO           |   5 -
 drivers/staging/mt7621-dma/hsdma-mt7621.c | 758 ----------------------
 6 files changed, 777 deletions(-)
 delete mode 100644 drivers/staging/mt7621-dma/Kconfig
 delete mode 100644 drivers/staging/mt7621-dma/Makefile
 delete mode 100644 drivers/staging/mt7621-dma/TODO
 delete mode 100644 drivers/staging/mt7621-dma/hsdma-mt7621.c
drivers/staging/Kconfig +0 -2
index c7ab0210dc4b..893af6f05e06 100644
@@ -86,8 +86,6 @@ source "drivers/staging/vc04_services/Kconfig"
 
 source "drivers/staging/pi433/Kconfig"
 
-source "drivers/staging/mt7621-dma/Kconfig"
-
 source "drivers/staging/mt7621-dts/Kconfig"
 
 source "drivers/staging/axis-fifo/Kconfig"
drivers/staging/Makefile +0 -1
index f1bee2a864ff..62a86fa2ab2e 100644
@@ -33,7 +33,6 @@ obj-$(CONFIG_KS7010)		+= ks7010/
 obj-$(CONFIG_GREYBUS)		+= greybus/
 obj-$(CONFIG_BCM2835_VCHIQ)	+= vc04_services/
 obj-$(CONFIG_PI433)		+= pi433/
-obj-$(CONFIG_SOC_MT7621)	+= mt7621-dma/
 obj-$(CONFIG_SOC_MT7621)	+= mt7621-dts/
 obj-$(CONFIG_XIL_AXIS_FIFO)	+= axis-fifo/
 obj-$(CONFIG_FIELDBUS_DEV)     += fieldbus/
drivers/staging/mt7621-dma/Kconfig deleted +0 -7
deleted file mode 100644
index 54a110288f92..000000000000
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-config MTK_HSDMA
-	tristate "MTK HSDMA support"
-	depends on RALINK && SOC_MT7621
-	select DMA_ENGINE
-	select DMA_VIRTUAL_CHANNELS
-
drivers/staging/mt7621-dma/Makefile deleted +0 -4
deleted file mode 100644
index 23256d1286f3..000000000000
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_MTK_HSDMA) += hsdma-mt7621.o
-
-ccflags-y += -I$(srctree)/drivers/dma
drivers/staging/mt7621-dma/TODO deleted +0 -5
deleted file mode 100644
index fdbc5002c32a..000000000000
@@ -1,5 +0,0 @@
-
-- general code review and clean up
-- ensure device-tree requirements are documented
-
-Cc: NeilBrown <[email protected]>
drivers/staging/mt7621-dma/hsdma-mt7621.c deleted +0 -758

758 lines not on this page · raw message

Signature · 1 line
2.33.0
#3 lore raw

PATCH 3/3 staging: mt7621-dts: remove 'gdma' and 'hsdma' nodes

In reply to Sergio Paracuellos

Drivers related with 'gdma' and 'hsdma' nodes are not in-tree. Remove them from the device tree file.

---
 drivers/staging/mt7621-dts/mt7621.dtsi | 38 --------------------------
 1 file changed, 38 deletions(-)
drivers/staging/mt7621-dts/mt7621.dtsi +0 -38
index 6d158e4f4b8c..644a65d1a6a1 100644
@@ -146,44 +146,6 @@ spi0: spi@b00 {
 			pinctrl-names = "default";
 			pinctrl-0 = <&spi_pins>;
 		};
-
-		gdma: gdma@2800 {
-			compatible = "ralink,rt3883-gdma";
-			reg = <0x2800 0x800>;
-
-			clocks = <&sysc MT7621_CLK_GDMA>;
-			clock-names = "gdma";
-			resets = <&rstctrl 14>;
-			reset-names = "dma";
-
-			interrupt-parent = <&gic>;
-			interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>;
-
-			#dma-cells = <1>;
-			#dma-channels = <16>;
-			#dma-requests = <16>;
-
-			status = "disabled";
-		};
-
-		hsdma: hsdma@7000 {
-			compatible = "mediatek,mt7621-hsdma";
-			reg = <0x7000 0x1000>;
-
-			clocks = <&sysc MT7621_CLK_HSDMA>;
-			clock-names = "hsdma";
-			resets = <&rstctrl 5>;
-			reset-names = "hsdma";
-
-			interrupt-parent = <&gic>;
-			interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
-
-			#dma-cells = <1>;
-			#dma-channels = <1>;
-			#dma-requests = <1>;
-
-			status = "disabled";
-		};
 	};
 
 	pinctrl: pinctrl {
Signature · 1 line
2.33.0