Move the lantiq_gswip driver to its own folder and update
MAINTAINERS file accordingly.
This is done ahead of extending the driver to support the MaxLinear
GSW1xx series of standalone switch ICs, which includes adding a bunch
of files.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
v2: move driver to its own folder
MAINTAINERS | 3 +--
drivers/net/dsa/Kconfig | 8 +-------
drivers/net/dsa/Makefile | 2 +-
drivers/net/dsa/lantiq/Kconfig | 7 +++++++
drivers/net/dsa/lantiq/Makefile | 1 +
drivers/net/dsa/{ => lantiq}/lantiq_gswip.c | 0
drivers/net/dsa/{ => lantiq}/lantiq_gswip.h | 0
drivers/net/dsa/{ => lantiq}/lantiq_pce.h | 0
8 files changed, 11 insertions(+), 10 deletions(-)
create mode 100644 drivers/net/dsa/lantiq/Kconfig
create mode 100644 drivers/net/dsa/lantiq/Makefile
rename drivers/net/dsa/{ => lantiq}/lantiq_gswip.c (100%)
rename drivers/net/dsa/{ => lantiq}/lantiq_gswip.h (100%)
rename drivers/net/dsa/{ => lantiq}/lantiq_pce.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index bce96dd254b8..e86bdad15919 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13801,8 +13801,7 @@ M: Hauke Mehrtens <hauke@hauke-m.de>
L: netdev@vger.kernel.org
S: Maintained
F: Documentation/devicetree/bindings/net/dsa/lantiq,gswip.yaml
-F: drivers/net/dsa/lantiq_gswip.c
-F: drivers/net/dsa/lantiq_pce.h
+F: drivers/net/dsa/lantiq/*
F: drivers/net/ethernet/lantiq_xrx200.c
F: net/dsa/tag_gswip.c
diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig
index 202a35d8d061..4d9af691b989 100644
--- a/drivers/net/dsa/Kconfig
+++ b/drivers/net/dsa/Kconfig
@@ -26,13 +26,7 @@ config NET_DSA_LOOP
source "drivers/net/dsa/hirschmann/Kconfig"
-config NET_DSA_LANTIQ_GSWIP
- tristate "Lantiq / Intel GSWIP"
- depends on HAS_IOMEM
- select NET_DSA_TAG_GSWIP
- help
- This enables support for the Lantiq / Intel GSWIP 2.1 found in
- the xrx200 / VR9 SoC.
+source "drivers/net/dsa/lantiq/Kconfig"
config NET_DSA_MT7530
tristate "MediaTek MT7530 and MT7531 Ethernet switch support"
diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile
index 23dbdf1a36a8..c0a534fe6eaf 100644
--- a/drivers/net/dsa/Makefile
+++ b/drivers/net/dsa/Makefile
@@ -6,7 +6,6 @@ ifdef CONFIG_NET_DSA_LOOP
obj-$(CONFIG_FIXED_PHY) += dsa_loop_bdinfo.o
endif
obj-$(CONFIG_NET_DSA_KS8995) += ks8995.o
-obj-$(CONFIG_NET_DSA_LANTIQ_GSWIP) += lantiq_gswip.o
obj-$(CONFIG_NET_DSA_MT7530) += mt7530.o
obj-$(CONFIG_NET_DSA_MT7530_MDIO) += mt7530-mdio.o
obj-$(CONFIG_NET_DSA_MT7530_MMIO) += mt7530-mmio.o
@@ -20,6 +19,7 @@ obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM) += vitesse-vsc73xx-platform.o
obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX_SPI) += vitesse-vsc73xx-spi.o
obj-y += b53/
obj-y += hirschmann/
+obj-y += lantiq/
obj-y += microchip/
obj-y += mv88e6xxx/
obj-y += ocelot/
diff --git a/drivers/net/dsa/lantiq/Kconfig b/drivers/net/dsa/lantiq/Kconfig
new file mode 100644
index 000000000000..1cb053c823f7
--- /dev/null
+++ b/drivers/net/dsa/lantiq/Kconfig
@@ -0,0 +1,7 @@
+config NET_DSA_LANTIQ_GSWIP
+ tristate "Lantiq / Intel GSWIP"
+ depends on HAS_IOMEM
+ select NET_DSA_TAG_GSWIP
+ help
+ This enables support for the Lantiq / Intel GSWIP 2.1 found in
+ the xrx200 / VR9 SoC.
diff --git a/drivers/net/dsa/lantiq/Makefile b/drivers/net/dsa/lantiq/Makefile
new file mode 100644
index 000000000000..849f85ebebd6
--- /dev/null
+++ b/drivers/net/dsa/lantiq/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_NET_DSA_LANTIQ_GSWIP) += lantiq_gswip.o
diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq/lantiq_gswip.c
similarity index 100%
rename from drivers/net/dsa/lantiq_gswip.c
rename to drivers/net/dsa/lantiq/lantiq_gswip.c
diff --git a/drivers/net/dsa/lantiq_gswip.h b/drivers/net/dsa/lantiq/lantiq_gswip.h
similarity index 100%
rename from drivers/net/dsa/lantiq_gswip.h
rename to drivers/net/dsa/lantiq/lantiq_gswip.h
diff --git a/drivers/net/dsa/lantiq_pce.h b/drivers/net/dsa/lantiq/lantiq_pce.h
similarity index 100%
rename from drivers/net/dsa/lantiq_pce.h
rename to drivers/net/dsa/lantiq/lantiq_pce.h
--
2.51.0On Wed, Aug 27, 2025 at 12:05:28AM +0100, Daniel Golle wrote:
> Move the lantiq_gswip driver to its own folder and update
> MAINTAINERS file accordingly.
> This is done ahead of extending the driver to support the MaxLinear
> GSW1xx series of standalone switch ICs, which includes adding a bunch
> of files.
>
> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
> ---
> v2: move driver to its own folder
>
> MAINTAINERS | 3 +--
> drivers/net/dsa/Kconfig | 8 +-------
> drivers/net/dsa/Makefile | 2 +-
> drivers/net/dsa/lantiq/Kconfig | 7 +++++++
> drivers/net/dsa/lantiq/Makefile | 1 +
> drivers/net/dsa/{ => lantiq}/lantiq_gswip.c | 0
> drivers/net/dsa/{ => lantiq}/lantiq_gswip.h | 0
> drivers/net/dsa/{ => lantiq}/lantiq_pce.h | 0
> 8 files changed, 11 insertions(+), 10 deletions(-)
> create mode 100644 drivers/net/dsa/lantiq/Kconfig
> create mode 100644 drivers/net/dsa/lantiq/Makefile
> rename drivers/net/dsa/{ => lantiq}/lantiq_gswip.c (100%)
> rename drivers/net/dsa/{ => lantiq}/lantiq_gswip.h (100%)
> rename drivers/net/dsa/{ => lantiq}/lantiq_pce.h (100%)
I don't have a problem with this patch per se, but it will make it
harder to avoid conflicts for the known and unsubmitted bug fixes, like:
https://github.com/dangowrt/linux/commit/c7445039b965e1a6aad1a4435e7efd4b7cb30f5b
https://github.com/dangowrt/linux/commit/48d5cac46fc95a826b5eb49434a3a68b75a8ae1a
which I haven't found the time to submit (sorry). Are we okay with that?
On Thu, Aug 28, 2025 at 11:33:46PM +0300, Vladimir Oltean wrote:
> On Wed, Aug 27, 2025 at 12:05:28AM +0100, Daniel Golle wrote:
> > Move the lantiq_gswip driver to its own folder and update
> > MAINTAINERS file accordingly.
> > This is done ahead of extending the driver to support the MaxLinear
> > GSW1xx series of standalone switch ICs, which includes adding a bunch
> > of files.
> >
> > Signed-off-by: Daniel Golle <daniel@makrotopia.org>
> > ---
> > v2: move driver to its own folder
> >
> > MAINTAINERS | 3 +--
> > drivers/net/dsa/Kconfig | 8 +-------
> > drivers/net/dsa/Makefile | 2 +-
> > drivers/net/dsa/lantiq/Kconfig | 7 +++++++
> > drivers/net/dsa/lantiq/Makefile | 1 +
> > drivers/net/dsa/{ => lantiq}/lantiq_gswip.c | 0
> > drivers/net/dsa/{ => lantiq}/lantiq_gswip.h | 0
> > drivers/net/dsa/{ => lantiq}/lantiq_pce.h | 0
> > 8 files changed, 11 insertions(+), 10 deletions(-)
> > create mode 100644 drivers/net/dsa/lantiq/Kconfig
> > create mode 100644 drivers/net/dsa/lantiq/Makefile
> > rename drivers/net/dsa/{ => lantiq}/lantiq_gswip.c (100%)
> > rename drivers/net/dsa/{ => lantiq}/lantiq_gswip.h (100%)
> > rename drivers/net/dsa/{ => lantiq}/lantiq_pce.h (100%)
>
> I don't have a problem with this patch per se, but it will make it
> harder to avoid conflicts for the known and unsubmitted bug fixes, like:
> https://github.com/dangowrt/linux/commit/c7445039b965e1a6aad1a4435e7efd4b7cb30f5b
> https://github.com/dangowrt/linux/commit/48d5cac46fc95a826b5eb49434a3a68b75a8ae1a
> which I haven't found the time to submit (sorry). Are we okay with that?
I've prepared a tree rebasing your tree
https://github.com/vladimiroltean/linux/commits/lantiq-gswip/
onto current net-next:
https://github.com/dangowrt/linux/commits/lantiq_gswip-fixes-for-vladimiroltean/
If you don't have time to submit the patches from this tree yourself I
can do that on your behalf, just let me know which of the patches you'd
like to submit as fixes, I'll find the causing commit, add the Fixes:-tag
and send them to netdev@ for the net tree after the next net-next -> net
merge.
Or, in case that makes more sense, send the patches to 'net' now and
then solve the conflicts at the next net-next -> net merge, what ever
works better.
On 8/28/25 22:33, Vladimir Oltean wrote:
> On Wed, Aug 27, 2025 at 12:05:28AM +0100, Daniel Golle wrote:
>> Move the lantiq_gswip driver to its own folder and update
>> MAINTAINERS file accordingly.
>> This is done ahead of extending the driver to support the MaxLinear
>> GSW1xx series of standalone switch ICs, which includes adding a bunch
>> of files.
>>
>> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
>> ---
>> v2: move driver to its own folder
>>
>> MAINTAINERS | 3 +--
>> drivers/net/dsa/Kconfig | 8 +-------
>> drivers/net/dsa/Makefile | 2 +-
>> drivers/net/dsa/lantiq/Kconfig | 7 +++++++
>> drivers/net/dsa/lantiq/Makefile | 1 +
>> drivers/net/dsa/{ => lantiq}/lantiq_gswip.c | 0
>> drivers/net/dsa/{ => lantiq}/lantiq_gswip.h | 0
>> drivers/net/dsa/{ => lantiq}/lantiq_pce.h | 0
>> 8 files changed, 11 insertions(+), 10 deletions(-)
>> create mode 100644 drivers/net/dsa/lantiq/Kconfig
>> create mode 100644 drivers/net/dsa/lantiq/Makefile
>> rename drivers/net/dsa/{ => lantiq}/lantiq_gswip.c (100%)
>> rename drivers/net/dsa/{ => lantiq}/lantiq_gswip.h (100%)
>> rename drivers/net/dsa/{ => lantiq}/lantiq_pce.h (100%)
>
> I don't have a problem with this patch per se, but it will make it
> harder to avoid conflicts for the known and unsubmitted bug fixes, like:
> https://github.com/dangowrt/linux/commit/c7445039b965e1a6aad1a4435e7efd4b7cb30f5b
> https://github.com/dangowrt/linux/commit/48d5cac46fc95a826b5eb49434a3a68b75a8ae1a
> which I haven't found the time to submit (sorry). Are we okay with that?
I think git cherry-pick will still work.
I would like to have these fixes also in the stable kernel, if cherry
pick does not work you can also send modified version to linux stable.
Hauke
On Thu, Aug 28, 2025 at 10:49:18PM +0200, Hauke Mehrtens wrote:
> On 8/28/25 22:33, Vladimir Oltean wrote:
> > On Wed, Aug 27, 2025 at 12:05:28AM +0100, Daniel Golle wrote:
> > > Move the lantiq_gswip driver to its own folder and update
> > > MAINTAINERS file accordingly.
> > > This is done ahead of extending the driver to support the MaxLinear
> > > GSW1xx series of standalone switch ICs, which includes adding a bunch
> > > of files.
> > >
> > > Signed-off-by: Daniel Golle <daniel@makrotopia.org>
> > > ---
> > > v2: move driver to its own folder
> > >
> > > MAINTAINERS | 3 +--
> > > drivers/net/dsa/Kconfig | 8 +-------
> > > drivers/net/dsa/Makefile | 2 +-
> > > drivers/net/dsa/lantiq/Kconfig | 7 +++++++
> > > drivers/net/dsa/lantiq/Makefile | 1 +
> > > drivers/net/dsa/{ => lantiq}/lantiq_gswip.c | 0
> > > drivers/net/dsa/{ => lantiq}/lantiq_gswip.h | 0
> > > drivers/net/dsa/{ => lantiq}/lantiq_pce.h | 0
> > > 8 files changed, 11 insertions(+), 10 deletions(-)
> > > create mode 100644 drivers/net/dsa/lantiq/Kconfig
> > > create mode 100644 drivers/net/dsa/lantiq/Makefile
> > > rename drivers/net/dsa/{ => lantiq}/lantiq_gswip.c (100%)
> > > rename drivers/net/dsa/{ => lantiq}/lantiq_gswip.h (100%)
> > > rename drivers/net/dsa/{ => lantiq}/lantiq_pce.h (100%)
> >
> > I don't have a problem with this patch per se, but it will make it
> > harder to avoid conflicts for the known and unsubmitted bug fixes, like:
> > https://github.com/dangowrt/linux/commit/c7445039b965e1a6aad1a4435e7efd4b7cb30f5b
> > https://github.com/dangowrt/linux/commit/48d5cac46fc95a826b5eb49434a3a68b75a8ae1a
> > which I haven't found the time to submit (sorry). Are we okay with that?
>
> I think git cherry-pick will still work.
>
> I would like to have these fixes also in the stable kernel, if cherry pick
> does not work you can also send modified version to linux stable.
Cherry-pick anyway already won't work any more because of
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=6e8e6baf16ce7d2310959ae81d0194a56874e0d2
However, I've already rebased the series with Vladimir's fixes on top of
that and this pending series, see
https://github.com/dangowrt/linux/commits/1be5db5457b6956e606af37b03fb1dc86aadd392/
© 2016 - 2025 Red Hat, Inc.