net: dsa: mv88e6xxx: move driver in its own folder

With the upcoming support for cross-chip operations and other mv88e6xxx
enhancements, new files will be added.

Similarly to mlxsw or b53, move mv88e6xxx files into their own folder.

In the meantime, update the MAINTAINERS entry to please checkpatch.pl,
by replacing the invalid 88E6352 entry with 88E6XXX, maintained by
Andrew and myself.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/MAINTAINERS b/MAINTAINERS
index c9544f55496ae5a2eb9d0e79c0983530ebd32bf4..3a171a94e2a533960f9a4b95948f88f849f5e381 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7171,6 +7171,12 @@ W:       http://www.kernel.org/doc/man-pages
 L:     linux-man@vger.kernel.org
 S:     Maintained
 
+MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER
+M:     Andrew Lunn <andrew@lunn.ch>
+M:     Vivien Didelot <vivien.didelot@savoirfairelinux.com>
+S:     Maintained
+F:     drivers/net/dsa/mv88e6xxx/
+
 MARVELL ARMADA DRM SUPPORT
 M:     Russell King <rmk+kernel@armlinux.org.uk>
 S:     Maintained
@@ -7178,11 +7184,6 @@ F:       drivers/gpu/drm/armada/
 F:     include/uapi/drm/armada_drm.h
 F:     Documentation/devicetree/bindings/display/armada/
 
-MARVELL 88E6352 DSA support
-M:     Guenter Roeck <linux@roeck-us.net>
-S:     Maintained
-F:     drivers/net/dsa/mv88e6352.c
-
 MARVELL CRYPTO DRIVER
 M:     Boris Brezillon <boris.brezillon@free-electrons.com>
 M:     Arnaud Ebalard <arno@natisbad.org>

diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig
index be481e15ec9b45a85bd8684dd229bedf71f2ee4a..8f4544394f44736a11451742dfc13f43cb26ef02 100644 (file)
--- a/drivers/net/dsa/Kconfig
+++ b/drivers/net/dsa/Kconfig
@@ -9,14 +9,6 @@ config NET_DSA_MV88E6060
          This enables support for the Marvell 88E6060 ethernet switch
          chip.
 
-config NET_DSA_MV88E6XXX
-       tristate "Marvell 88E6xxx Ethernet switch chip support"
-       depends on NET_DSA
-       select NET_DSA_TAG_EDSA
-       ---help---
-         This enables support for most of the Marvell 88E6xxx models of
-         Ethernet switch chips, except 88E6060.
-
 config NET_DSA_BCM_SF2
        tristate "Broadcom Starfighter 2 Ethernet switch support"
        depends on HAS_IOMEM && NET_DSA
@@ -30,4 +22,6 @@ config NET_DSA_BCM_SF2
 
 source "drivers/net/dsa/b53/Kconfig"
 
+source "drivers/net/dsa/mv88e6xxx/Kconfig"
+
 endmenu

diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile
index 97bc70a7f3c75dfa4831ffc2502f981640d7a0ef..ca1e71b853a60b2dbefaa7760eb390b8c4269d67 100644 (file)
--- a/drivers/net/dsa/Makefile
+++ b/drivers/net/dsa/Makefile
@@ -1,5 +1,5 @@
 obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
-obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o
 obj-$(CONFIG_NET_DSA_BCM_SF2)  += bcm_sf2.o
 
 obj-y                          += b53/
+obj-y                          += mv88e6xxx/

diff --git a/drivers/net/dsa/mv88e6xxx/Kconfig b/drivers/net/dsa/mv88e6xxx/Kconfig
new file mode 100644 (file)
index 0000000..490bc06
--- /dev/null
+++ b/drivers/net/dsa/mv88e6xxx/Kconfig
@@ -0,0 +1,7 @@
+config NET_DSA_MV88E6XXX
+       tristate "Marvell 88E6xxx Ethernet switch fabric support"
+       depends on NET_DSA
+       select NET_DSA_TAG_EDSA
+       help
+         This driver adds support for most of the Marvell 88E6xxx models of
+         Ethernet switch chips, except 88E6060.

diff --git a/drivers/net/dsa/mv88e6xxx/Makefile b/drivers/net/dsa/mv88e6xxx/Makefile
new file mode 100644 (file)
index 0000000..1128fc7
--- /dev/null
+++ b/drivers/net/dsa/mv88e6xxx/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o

diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx/mv88e6xxx.c
similarity index 99%
rename from drivers/net/dsa/mv88e6xxx.c
rename to drivers/net/dsa/mv88e6xxx/mv88e6xxx.c
index 9b116d8d4e23bc08ef5ad68bd5c97712db195dd1..2073f7b991a65746d5f0c089f53f410ab1c7a5e0 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx.c
+++ b/drivers/net/dsa/mv88e6xxx/mv88e6xxx.c
@@ -1,5 +1,6 @@
 /*
- * net/dsa/mv88e6xxx.c - Marvell 88e6xxx switch chip support
+ * Marvell 88e6xxx Ethernet switch single-chip support
+ *
  * Copyright (c) 2008 Marvell Semiconductor
  *
  * Copyright (c) 2015 CMC Electronics, Inc.

diff --git a/drivers/net/dsa/mv88e6xxx.h b/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h
similarity index 99%
rename from drivers/net/dsa/mv88e6xxx.h
rename to drivers/net/dsa/mv88e6xxx/mv88e6xxx.h
index a94acd887929cc5a493259ee964b68cbdb9ae772..856c6e50565fff2aa1ae46597caf6e5dead7ca8e 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx.h
+++ b/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h
@@ -1,5 +1,6 @@
 /*
- * net/dsa/mv88e6xxx.h - Marvell 88e6xxx switch chip support
+ * Marvell 88e6xxx common definitions
+ *
  * Copyright (c) 2008 Marvell Semiconductor
  *
  * This program is free software; you can redistribute it and/or modify