Skip to content

Commit 0c90775

Browse files
committed
Merge branch 'net-phy-split-the-mscc-driver'
Antoine Tenart says: ==================== net: phy: split the mscc driver This is a proposal to split the MSCC PHY driver, as its code base grew a lot lately (it's already 3800+ lines). It also supports features requiring a lot of code (MACsec), which would gain in being split from the driver core, for readability and maintenance. This is also done as other features should be coming later, which will also need lots of code addition. This series shouldn't change the way the driver works. I checked, and there were no patch pending on this driver. This change was done on top of all the modifications done on this driver in net-next. Since v2: - Defined inline functions as static inline. - Fixed a locking issue reported by Kbuild. Since v1: - Moved more definitions into the mscc_macsec.h header. ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 3d572b2 + 0b92f89 commit 0c90775

File tree

8 files changed

+1532
-1474
lines changed

8 files changed

+1532
-1474
lines changed

drivers/net/phy/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ obj-$(CONFIG_MICREL_KS8995MA) += spi_ks8995.o
8989
obj-$(CONFIG_MICREL_PHY) += micrel.o
9090
obj-$(CONFIG_MICROCHIP_PHY) += microchip.o
9191
obj-$(CONFIG_MICROCHIP_T1_PHY) += microchip_t1.o
92-
obj-$(CONFIG_MICROSEMI_PHY) += mscc.o
92+
obj-$(CONFIG_MICROSEMI_PHY) += mscc/
9393
obj-$(CONFIG_NATIONAL_PHY) += national.o
9494
obj-$(CONFIG_NXP_TJA11XX_PHY) += nxp-tja11xx.o
9595
obj-$(CONFIG_QSEMI_PHY) += qsemi.o

drivers/net/phy/mscc/Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
#
3+
# Makefile for MSCC networking PHY driver
4+
5+
obj-$(CONFIG_MICROSEMI_PHY) := mscc.o
6+
mscc-objs := mscc_main.o
7+
8+
ifdef CONFIG_MACSEC
9+
mscc-objs += mscc_macsec.o
10+
endif

0 commit comments

Comments
 (0)