Commit ef734763 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Move-MDIO-drivers-into-their-own-directory' 



Andrew Lunn says:

====================
Move MDIO drivers into their own directory

The phy subdirectory is getting cluttered. It has both PHY drivers and
MDIO drivers, plus a stray switch driver. Soon more PCS drivers are
likely to appear.

Move MDIO and PCS drivers into new directories. This requires fixing
up the xgene driver which uses a relative include path.

v2:
Move the subdirs to drivers/net, rather than drivers/net/phy.

v3:
Add subdirectories under include/linux for mdio and pcs

v4:
there->their
include path fix
No new kconfig prompts
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f0966581 0457eb26

MAINTAINERS

+8 −4
Original line number Diff line number Diff line
@@ -1286,7 +1286,7 @@ S: Supported 
F:	Documentation/devicetree/bindings/net/apm-xgene-enet.txt

F:	Documentation/devicetree/bindings/net/apm-xgene-mdio.txt

F:	drivers/net/ethernet/apm/xgene/

F:	drivers/net/phy/mdio-xgene.c

F:	drivers/net/mdio/mdio-xgene.c









APPLIED MICRO (APM) X-GENE SOC PMU









M:	Khuong Dinh <khuong@os.amperecomputing.com>








@@ -6513,11 +6513,14 @@ F:	Documentation/devicetree/bindings/net/ethernet-phy.yaml







F:	Documentation/devicetree/bindings/net/mdio*









F:	Documentation/devicetree/bindings/net/qca,ar803x.yaml









F:	Documentation/networking/phy.rst









F:	drivers/net/mdio/









F:	drivers/net/pcs/









F:	drivers/net/phy/









F:	drivers/of/of_mdio.c









F:	drivers/of/of_net.c









F:	include/dt-bindings/net/qca-ar803x.h









F:	include/linux/*mdio*.h









F:	include/linux/mdio/*.h









F:	include/linux/of_net.h









F:	include/linux/phy.h









F:	include/linux/phy_fixed.h








@@ -10497,7 +10500,7 @@ M:	Tobias Waldekranz <tobias@waldekranz.com>







L:	netdev@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/net/marvell,mvusb.yaml









F:	drivers/net/phy/mdio-mvusb.c









F:	drivers/net/mdio/mdio-mvusb.c

















MARVELL XENON MMC/SD/SDIO HOST CONTROLLER DRIVER









M:	Hu Ziji <huziji@marvell.com>








@@ -15646,6 +15649,7 @@ L:	netdev@vger.kernel.org







S:	Maintained









F:	drivers/net/phy/phylink.c









F:	drivers/net/phy/sfp*









F:	include/linux/mdio/mdio-i2c.h









F:	include/linux/phylink.h









F:	include/linux/sfp.h









K:	phylink\.h|struct\s+phylink|\.phylink|>phylink_|phylink_(autoneg|clear|connect|create|destroy|disconnect|ethtool|helper|mac|mii|of|set|start|stop|test|validate)








@@ -16730,8 +16734,8 @@ SYNOPSYS DESIGNWARE ETHERNET XPCS DRIVER







M:	Jose Abreu <Jose.Abreu@synopsys.com>









L:	netdev@vger.kernel.org









S:	Supported









F:	drivers/net/phy/mdio-xpcs.c









F:	include/linux/mdio-xpcs.h









F:	drivers/net/pcs/pcs-xpcs.c









F:	include/linux/pcs/pcs-xpcs.h

















SYNOPSYS DESIGNWARE I2C DRIVER









M:	Jarkko Nikula <jarkko.nikula@linux.intel.com>
































drivers/net/Kconfig



+4
−0






























Original line number
Diff line number
Diff line







@@ -473,6 +473,10 @@ config NET_SB1000

















source "drivers/net/phy/Kconfig"



















source "drivers/net/mdio/Kconfig"



















source "drivers/net/pcs/Kconfig"



















source "drivers/net/plip/Kconfig"



















source "drivers/net/ppp/Kconfig"
































drivers/net/Makefile



+2
−0






























Original line number
Diff line number
Diff line







@@ -21,6 +21,8 @@ obj-$(CONFIG_MDIO) += mdio.o







obj-$(CONFIG_NET) += Space.o loopback.o









obj-$(CONFIG_NETCONSOLE) += netconsole.o









obj-y += phy/









obj-y += mdio/









obj-y += pcs/









obj-$(CONFIG_RIONET) += rionet.o









obj-$(CONFIG_NET_TEAM) += team/









obj-$(CONFIG_TUN) += tun.o
































drivers/net/ethernet/apm/xgene/xgene_enet_main.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -18,6 +18,7 @@







#include <linux/of_platform.h>









#include <linux/of_net.h>









#include <linux/of_mdio.h>









#include <linux/mdio/mdio-xgene.h>









#include <linux/module.h>









#include <net/ip.h>









#include <linux/prefetch.h>








@@ -26,7 +27,6 @@







#include "xgene_enet_hw.h"









#include "xgene_enet_cle.h"









#include "xgene_enet_ring2.h"









#include "../../../phy/mdio-xgene.h"



















#define ETHER_MIN_PACKET	64









#define ETHER_STD_PACKET	1518
































drivers/net/ethernet/stmicro/stmmac/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -3,7 +3,7 @@ config STMMAC_ETH







	tristate "STMicroelectronics Multi-Gigabit Ethernet driver"









	depends on HAS_IOMEM && HAS_DMA









	select MII









	select MDIO_XPCS









	select PCS_XPCS









	select PAGE_POOL









	select PHYLINK









	select CRC32