net: dsa: lantiq_gswip: move to dedicated folder

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>
Reviewed-by: Hauke Mehrtens <hauke@hauke-m.de>
Link: https://patch.msgid.link/a5923dee9a174501b284dc473bdec9dd89c68de1.1756520811.git.daniel@makrotopia.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 94213c175533425df9e39da5df391bac06086c87..6cad6225381a69a22a607a5c70de401005ee8876 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13812,8 +13812,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 202a35d8d06188a3e9bdfbbe135b70ae492f9a7b..4d9af691b9896ef16e0aa7c8566a587396b324a0 100644 (file)
--- 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 23dbdf1a36a8af6842e8c0e7fb12ee24a0dd36d8..c0a534fe6eaf7532866240d66d44517ebe2e92b3 100644 (file)
--- 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 (file)
index 0000000..1cb053c
--- /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 (file)
index 0000000..849f85e
--- /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