Kaynağa Gözat

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>
Vivien Didelot 9 yıl önce
ebeveyn
işleme
0d3cd4b6b4

+ 6 - 5
MAINTAINERS

@@ -7171,6 +7171,12 @@ W:	http://www.kernel.org/doc/man-pages
 L:	linux-man@vger.kernel.org
 L:	linux-man@vger.kernel.org
 S:	Maintained
 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
 MARVELL ARMADA DRM SUPPORT
 M:	Russell King <rmk+kernel@armlinux.org.uk>
 M:	Russell King <rmk+kernel@armlinux.org.uk>
 S:	Maintained
 S:	Maintained
@@ -7178,11 +7184,6 @@ F:	drivers/gpu/drm/armada/
 F:	include/uapi/drm/armada_drm.h
 F:	include/uapi/drm/armada_drm.h
 F:	Documentation/devicetree/bindings/display/armada/
 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
 MARVELL CRYPTO DRIVER
 M:	Boris Brezillon <boris.brezillon@free-electrons.com>
 M:	Boris Brezillon <boris.brezillon@free-electrons.com>
 M:	Arnaud Ebalard <arno@natisbad.org>
 M:	Arnaud Ebalard <arno@natisbad.org>

+ 2 - 8
drivers/net/dsa/Kconfig

@@ -9,14 +9,6 @@ config NET_DSA_MV88E6060
 	  This enables support for the Marvell 88E6060 ethernet switch
 	  This enables support for the Marvell 88E6060 ethernet switch
 	  chip.
 	  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
 config NET_DSA_BCM_SF2
 	tristate "Broadcom Starfighter 2 Ethernet switch support"
 	tristate "Broadcom Starfighter 2 Ethernet switch support"
 	depends on HAS_IOMEM && NET_DSA
 	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/b53/Kconfig"
 
 
+source "drivers/net/dsa/mv88e6xxx/Kconfig"
+
 endmenu
 endmenu

+ 1 - 1
drivers/net/dsa/Makefile

@@ -1,5 +1,5 @@
 obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
 obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
-obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o
 obj-$(CONFIG_NET_DSA_BCM_SF2)	+= bcm_sf2.o
 obj-$(CONFIG_NET_DSA_BCM_SF2)	+= bcm_sf2.o
 
 
 obj-y				+= b53/
 obj-y				+= b53/
+obj-y				+= mv88e6xxx/

+ 7 - 0
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.

+ 1 - 0
drivers/net/dsa/mv88e6xxx/Makefile

@@ -0,0 +1 @@
+obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o

+ 2 - 1
drivers/net/dsa/mv88e6xxx.c → 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) 2008 Marvell Semiconductor
  *
  *
  * Copyright (c) 2015 CMC Electronics, Inc.
  * Copyright (c) 2015 CMC Electronics, Inc.

+ 2 - 1
drivers/net/dsa/mv88e6xxx.h → 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
  * Copyright (c) 2008 Marvell Semiconductor
  *
  *
  * This program is free software; you can redistribute it and/or modify
  * This program is free software; you can redistribute it and/or modify