* [PATCH v2] mips: dts: ralink: add MT7621 SoC
@ 2022-03-15 16:01 Arınç ÜNAL
2022-03-15 17:32 ` Thomas Bogendoerfer
0 siblings, 1 reply; 3+ messages in thread
From: Arınç ÜNAL @ 2022-03-15 16:01 UTC (permalink / raw)
To: Greg KH, Rob Herring, Thomas Bogendoerfer, Sergio Paracuellos,
NeilBrown, DENG Qingfang, Sean Wang, Mark Lee,
Luiz Angelo Daros de Luca, erkin.bozoglu
Cc: linux-staging, devicetree, linux-mips, linux-kernel,
Arınç ÜNAL
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.
Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
Acked-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
---
v2: fix a tiny grammar mistake, add Sergio's acked-by.
This patch does changes on top of commit dcd520af4eac ("staging:
mt7621-dts: fix cpuintc and fixedregulator dtc warnings, fix xhci") which
is currently applied on gregkh/staging.git staging-next branch.
---
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 62d6758bf8c4..92eda5adca44 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16181,6 +16181,13 @@ L: linux-mips@vger.kernel.org
S: Maintained
F: arch/mips/ralink
+RALINK MT7621 MIPS ARCHITECTURE
+M: Arınç ÜNAL <arinc.unal@arinc9.com>
+M: Sergio Paracuellos <sergio.paracuellos@gmail.com>
+L: linux-mips@vger.kernel.org
+S: Maintained
+F: arch/mips/boot/dts/ralink/mt7621*
+
RALINK RT2X00 WIRELESS LAN DRIVER
M: Stanislaw Gruszka <stf_xl@wp.pl>
M: Helmut Schaa <helmut.schaa@googlemail.com>
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 d1ce500c0319..efa194ec12fb 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -82,8 +82,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 82e912a7586f..db876663a1e3 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -31,7 +31,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 <neil@brown.name>
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] mips: dts: ralink: add MT7621 SoC
2022-03-15 16:01 [PATCH v2] mips: dts: ralink: add MT7621 SoC Arınç ÜNAL
@ 2022-03-15 17:32 ` Thomas Bogendoerfer
2022-03-16 6:48 ` Sergio Paracuellos
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Bogendoerfer @ 2022-03-15 17:32 UTC (permalink / raw)
To: Arınç ÜNAL
Cc: Greg KH, Rob Herring, Sergio Paracuellos, NeilBrown,
DENG Qingfang, Sean Wang, Mark Lee, Luiz Angelo Daros de Luca,
erkin.bozoglu, linux-staging, devicetree, linux-mips,
linux-kernel
On Tue, Mar 15, 2022 at 07:01:50PM +0300, Arınç ÜNAL wrote:
> 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.
>
> Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
> Acked-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
> ---
> v2: fix a tiny grammar mistake, add Sergio's acked-by.
>
> This patch does changes on top of commit dcd520af4eac ("staging:
> mt7621-dts: fix cpuintc and fixedregulator dtc warnings, fix xhci") which
> is currently applied on gregkh/staging.git staging-next branch.
>
> ---
> 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
Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] mips: dts: ralink: add MT7621 SoC
2022-03-15 17:32 ` Thomas Bogendoerfer
@ 2022-03-16 6:48 ` Sergio Paracuellos
0 siblings, 0 replies; 3+ messages in thread
From: Sergio Paracuellos @ 2022-03-16 6:48 UTC (permalink / raw)
To: Thomas Bogendoerfer
Cc: Arınç ÜNAL, Greg KH, Rob Herring, NeilBrown,
DENG Qingfang, Sean Wang, Mark Lee, Luiz Angelo Daros de Luca,
erkin.bozoglu, linux-staging,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list:MIPS, linux-kernel
On Tue, Mar 15, 2022 at 6:32 PM Thomas Bogendoerfer
<tsbogend@alpha.franken.de> wrote:
>
> On Tue, Mar 15, 2022 at 07:01:50PM +0300, Arınç ÜNAL wrote:
> > 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.
> >
> > Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
> > Acked-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
> > ---
> > v2: fix a tiny grammar mistake, add Sergio's acked-by.
> >
> > This patch does changes on top of commit dcd520af4eac ("staging:
> > mt7621-dts: fix cpuintc and fixedregulator dtc warnings, fix xhci") which
> > is currently applied on gregkh/staging.git staging-next branch.
> >
> > ---
> > 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
>
> Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Thanks, Thomas!!
Best regards,
Sergio Paracuellos
>
> --
> Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
> good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-16 6:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-15 16:01 [PATCH v2] mips: dts: ralink: add MT7621 SoC Arınç ÜNAL
2022-03-15 17:32 ` Thomas Bogendoerfer
2022-03-16 6:48 ` Sergio Paracuellos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).