From 7a6ee0bbab2551d7189ce0f5e625fef4d612ebea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= Date: Tue, 15 Mar 2022 19:01:50 +0300 Subject: [PATCH] mips: dts: ralink: add MT7621 SoC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The MT7621 system-on-a-chip includes an 880 MHz MIPS1004Kc dual-core CPU, a 5-port 10/100/1000 switch/PHY and one RGMII. Add the devicetrees for GB-PC1 and GB-PC2 devices which use MT7621 SoC. Acked-by: Sergio Paracuellos Acked-by: Thomas Bogendoerfer Signed-off-by: Arınç ÜNAL Link: https://lore.kernel.org/r/20220315160149.3617-1-arinc.unal@arinc9.com Signed-off-by: Greg Kroah-Hartman --- MAINTAINERS | 7 +++++++ arch/mips/boot/dts/ralink/Makefile | 4 ++++ .../mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts | 0 .../mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 0 .../mips/boot/dts/ralink}/mt7621.dtsi | 0 arch/mips/ralink/Kconfig | 5 +++++ drivers/staging/Kconfig | 2 -- drivers/staging/Makefile | 1 - drivers/staging/mt7621-dts/Kconfig | 11 ----------- drivers/staging/mt7621-dts/Makefile | 5 ----- drivers/staging/mt7621-dts/TODO | 5 ----- 11 files changed, 16 insertions(+), 24 deletions(-) rename drivers/staging/mt7621-dts/gbpc1.dts => arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts (100%) rename drivers/staging/mt7621-dts/gbpc2.dts => arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts (100%) rename {drivers/staging/mt7621-dts => arch/mips/boot/dts/ralink}/mt7621.dtsi (100%) delete mode 100644 drivers/staging/mt7621-dts/Kconfig delete mode 100644 drivers/staging/mt7621-dts/Makefile delete mode 100644 drivers/staging/mt7621-dts/TODO diff --git a/MAINTAINERS b/MAINTAINERS index bf58c6c4f812..fd140717854d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16180,6 +16180,13 @@ L: linux-mips@vger.kernel.org S: Maintained F: arch/mips/ralink +RALINK MT7621 MIPS ARCHITECTURE +M: Arınç ÜNAL +M: Sergio Paracuellos +L: linux-mips@vger.kernel.org +S: Maintained +F: arch/mips/boot/dts/ralink/mt7621* + RALINK RT2X00 WIRELESS LAN DRIVER M: Stanislaw Gruszka M: Helmut Schaa diff --git a/arch/mips/boot/dts/ralink/Makefile b/arch/mips/boot/dts/ralink/Makefile index 6c26dfa0a903..11732b8c8163 100644 --- a/arch/mips/boot/dts/ralink/Makefile +++ b/arch/mips/boot/dts/ralink/Makefile @@ -6,4 +6,8 @@ dtb-$(CONFIG_DTB_MT7620A_EVAL) += mt7620a_eval.dtb dtb-$(CONFIG_DTB_OMEGA2P) += omega2p.dtb dtb-$(CONFIG_DTB_VOCORE2) += vocore2.dtb +dtb-$(CONFIG_SOC_MT7621) += \ + mt7621-gnubee-gb-pc1.dtb \ + mt7621-gnubee-gb-pc2.dtb + obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y)) diff --git a/drivers/staging/mt7621-dts/gbpc1.dts b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts similarity index 100% rename from drivers/staging/mt7621-dts/gbpc1.dts rename to arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts diff --git a/drivers/staging/mt7621-dts/gbpc2.dts b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts similarity index 100% rename from drivers/staging/mt7621-dts/gbpc2.dts rename to arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts diff --git a/drivers/staging/mt7621-dts/mt7621.dtsi b/arch/mips/boot/dts/ralink/mt7621.dtsi similarity index 100% rename from drivers/staging/mt7621-dts/mt7621.dtsi rename to arch/mips/boot/dts/ralink/mt7621.dtsi diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig index 120adad51d6a..f9fe15630abb 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -54,10 +54,15 @@ choice select HAVE_PCI select PCI_DRIVERS_GENERIC select SOC_BUS + + help + The MT7621 system-on-a-chip includes an 880 MHz MIPS1004Kc dual-core CPU, + a 5-port 10/100/1000 switch/PHY and one RGMII. endchoice choice prompt "Devicetree selection" + depends on !SOC_MT7621 default DTB_RT_NONE help Select the devicetree. diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index af60ca591c99..932acb4e8cbc 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -80,8 +80,6 @@ source "drivers/staging/vc04_services/Kconfig" source "drivers/staging/pi433/Kconfig" -source "drivers/staging/mt7621-dts/Kconfig" - source "drivers/staging/axis-fifo/Kconfig" source "drivers/staging/fieldbus/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index ad59134e97ad..3ffb35ccfae2 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -30,7 +30,6 @@ obj-$(CONFIG_KS7010) += ks7010/ obj-$(CONFIG_GREYBUS) += greybus/ obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/ obj-$(CONFIG_PI433) += pi433/ -obj-$(CONFIG_SOC_MT7621) += mt7621-dts/ obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/ obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/ obj-$(CONFIG_QLGE) += qlge/ diff --git a/drivers/staging/mt7621-dts/Kconfig b/drivers/staging/mt7621-dts/Kconfig deleted file mode 100644 index 6932ab7acadf..000000000000 --- a/drivers/staging/mt7621-dts/Kconfig +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -config DTB_GNUBEE1 - bool "GnuBee1 2.5inch NAS" - depends on SOC_MT7621 && DTB_RT_NONE - select BUILTIN_DTB - -config DTB_GNUBEE2 - bool "GnuBee2 3.5inch NAS" - depends on SOC_MT7621 && DTB_RT_NONE - select BUILTIN_DTB - diff --git a/drivers/staging/mt7621-dts/Makefile b/drivers/staging/mt7621-dts/Makefile deleted file mode 100644 index b4ab99fed932..000000000000 --- a/drivers/staging/mt7621-dts/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_DTB_GNUBEE1) += gbpc1.dtb -dtb-$(CONFIG_DTB_GNUBEE2) += gbpc2.dtb - -obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) diff --git a/drivers/staging/mt7621-dts/TODO b/drivers/staging/mt7621-dts/TODO deleted file mode 100644 index 1b758e5c84e0..000000000000 --- a/drivers/staging/mt7621-dts/TODO +++ /dev/null @@ -1,5 +0,0 @@ - -- ensure all usage matches code -- ensure all features used are documented - -Cc: NeilBrown