[PATCH net-next v2 1/2] net: phy: Move Marvell PHY drivers to its own subdirectory

[Kory Maincent]

Move the Marvell PHY drivers to a dedicated directory to improve
organization and maintainability.

As part of this cleanup, and in preparation for adding PTP support in
the marvell driver, rename marvell.c to marvell_main.c.

Signed-off-by: Kory Maincent <kory.maincent@xxxxxxxxxxx>
---
 MAINTAINERS                                        |  2 +-
 drivers/net/phy/Kconfig                            | 23 +---------------------
 drivers/net/phy/Makefile                           |  5 +----
 drivers/net/phy/marvell/Kconfig                    | 23 ++++++++++++++++++++++
 drivers/net/phy/marvell/Makefile                   |  6 ++++++
 drivers/net/phy/{ => marvell}/marvell-88q2xxx.c    |  0
 drivers/net/phy/{ => marvell}/marvell-88x2222.c    |  0
 drivers/net/phy/{ => marvell}/marvell10g.c         |  0
 .../net/phy/{marvell.c => marvell/marvell_main.c}  |  0
 9 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 4c5c2e2c127877a8283793637b0e935ceec27aff..b57df9a87de798c2eab139214f01253ddc1d2708 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14302,7 +14302,7 @@ M:	Russell King <linux@xxxxxxxxxxxxxxx>
 M:	Marek Behún <kabel@xxxxxxxxxx>
 L:	netdev@xxxxxxxxxxxxxxx
 S:	Maintained
-F:	drivers/net/phy/marvell10g.c
+F:	drivers/net/phy/marvell/marvell10g.c
 
 MARVELL MVEBU THERMAL DRIVER
 M:	Miquel Raynal <miquel.raynal@xxxxxxxxxxx>
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index d29f9f7fd2e110415496f322b2936c903cbc4d9c..bccffa3a48fc88ca08c26753e12645bd824e9ff4 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -235,28 +235,7 @@ config LSI_ET1011C_PHY
 	help
 	  Supports the LSI ET1011C PHY.
 
-config MARVELL_PHY
-	tristate "Marvell Alaska PHYs"
-	help
-	  Currently has a driver for the 88E1XXX
-
-config MARVELL_10G_PHY
-	tristate "Marvell Alaska 10Gbit PHYs"
-	help
-	  Support for the Marvell Alaska MV88X3310 and compatible PHYs.
-
-config MARVELL_88Q2XXX_PHY
-	tristate "Marvell 88Q2XXX PHY"
-	depends on HWMON || HWMON=n
-	help
-	  Support for the Marvell 88Q2XXX 100/1000BASE-T1 Automotive Ethernet
-	  PHYs.
-
-config MARVELL_88X2222_PHY
-	tristate "Marvell 88X2222 PHY"
-	help
-	  Support for the Marvell 88X2222 Dual-port Multi-speed Ethernet
-	  Transceiver.
+source "drivers/net/phy/marvell/Kconfig"
 
 config MAXLINEAR_GPHY
 	tristate "Maxlinear Ethernet PHYs"
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index 23ce205ae91d88ef28fa24ec3689bed1be16a0be..1c0f271b26bee2abb965640b41865bb0f4fda6b6 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -70,10 +70,7 @@ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
 obj-$(CONFIG_INTEL_XWAY_PHY)	+= intel-xway.o
 obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
 obj-$(CONFIG_LXT_PHY)		+= lxt.o
-obj-$(CONFIG_MARVELL_10G_PHY)	+= marvell10g.o
-obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
-obj-$(CONFIG_MARVELL_88Q2XXX_PHY)	+= marvell-88q2xxx.o
-obj-$(CONFIG_MARVELL_88X2222_PHY)	+= marvell-88x2222.o
+obj-y				+= marvell/
 obj-$(CONFIG_MAXLINEAR_GPHY)	+= mxl-gpy.o
 obj-y				+= mediatek/
 obj-$(CONFIG_MESON_GXL_PHY)	+= meson-gxl.o
diff --git a/drivers/net/phy/marvell/Kconfig b/drivers/net/phy/marvell/Kconfig
new file mode 100644
index 0000000000000000000000000000000000000000..a85bc9e4311e6bedd4a89db9527aca82d55a0762
--- /dev/null
+++ b/drivers/net/phy/marvell/Kconfig
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: GPL-2.0
+config MARVELL_PHY
+	tristate "Marvell Alaska PHYs"
+	help
+	  Currently has a driver for the 88E1XXX
+
+config MARVELL_10G_PHY
+	tristate "Marvell Alaska 10Gbit PHYs"
+	help
+	  Support for the Marvell Alaska MV88X3310 and compatible PHYs.
+
+config MARVELL_88Q2XXX_PHY
+	tristate "Marvell 88Q2XXX PHY"
+	depends on HWMON || HWMON=n
+	help
+	  Support for the Marvell 88Q2XXX 100/1000BASE-T1 Automotive Ethernet
+	  PHYs.
+
+config MARVELL_88X2222_PHY
+	tristate "Marvell 88X2222 PHY"
+	help
+	  Support for the Marvell 88X2222 Dual-port Multi-speed Ethernet
+	  Transceiver.
diff --git a/drivers/net/phy/marvell/Makefile b/drivers/net/phy/marvell/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..2c3622b053d1f54eba518b06730b797fb103ee06
--- /dev/null
+++ b/drivers/net/phy/marvell/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_MARVELL_10G_PHY)	+= marvell10g.o
+marvell-y			:= marvell_main.o
+obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
+obj-$(CONFIG_MARVELL_88Q2XXX_PHY)	+= marvell-88q2xxx.o
+obj-$(CONFIG_MARVELL_88X2222_PHY)	+= marvell-88x2222.o
diff --git a/drivers/net/phy/marvell-88q2xxx.c b/drivers/net/phy/marvell/marvell-88q2xxx.c
similarity index 100%
rename from drivers/net/phy/marvell-88q2xxx.c
rename to drivers/net/phy/marvell/marvell-88q2xxx.c
diff --git a/drivers/net/phy/marvell-88x2222.c b/drivers/net/phy/marvell/marvell-88x2222.c
similarity index 100%
rename from drivers/net/phy/marvell-88x2222.c
rename to drivers/net/phy/marvell/marvell-88x2222.c
diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell/marvell10g.c
similarity index 100%
rename from drivers/net/phy/marvell10g.c
rename to drivers/net/phy/marvell/marvell10g.c
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell/marvell_main.c
similarity index 100%
rename from drivers/net/phy/marvell.c
rename to drivers/net/phy/marvell/marvell_main.c

-- 
2.34.1