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.
Andrew Lunn (5):
net: pcs: Move XPCS into new PCS subdirectory
net/phy/mdio-i2c: Move header file to include/linux
net: xgene: Move shared header file into include/linux
net: mdio: Move MDIO drivers into a new subdirectory
net: phy: Sort Kconfig and Makefile
MAINTAINERS | 10 +-
drivers/net/Kconfig | 4 +
drivers/net/Makefile | 2 +
.../net/ethernet/apm/xgene/xgene_enet_main.h | 2 +-
drivers/net/ethernet/stmicro/stmmac/Kconfig | 2 +-
drivers/net/ethernet/stmicro/stmmac/common.h | 2 +-
drivers/net/mdio/Kconfig | 241 +++++++++++
drivers/net/mdio/Makefile | 27 ++
drivers/net/{phy => mdio}/mdio-aspeed.c | 0
drivers/net/{phy => mdio}/mdio-bcm-iproc.c | 0
drivers/net/{phy => mdio}/mdio-bcm-unimac.c | 0
drivers/net/{phy => mdio}/mdio-bitbang.c | 0
drivers/net/{phy => mdio}/mdio-cavium.c | 0
drivers/net/{phy => mdio}/mdio-cavium.h | 0
drivers/net/{phy => mdio}/mdio-gpio.c | 0
drivers/net/{phy => mdio}/mdio-hisi-femac.c | 0
drivers/net/{phy => mdio}/mdio-i2c.c | 3 +-
drivers/net/{phy => mdio}/mdio-ipq4019.c | 0
drivers/net/{phy => mdio}/mdio-ipq8064.c | 0
drivers/net/{phy => mdio}/mdio-moxart.c | 0
drivers/net/{phy => mdio}/mdio-mscc-miim.c | 0
.../net/{phy => mdio}/mdio-mux-bcm-iproc.c | 0
drivers/net/{phy => mdio}/mdio-mux-gpio.c | 0
.../net/{phy => mdio}/mdio-mux-meson-g12a.c | 0
drivers/net/{phy => mdio}/mdio-mux-mmioreg.c | 0
.../net/{phy => mdio}/mdio-mux-multiplexer.c | 0
drivers/net/{phy => mdio}/mdio-mux.c | 0
drivers/net/{phy => mdio}/mdio-mvusb.c | 0
drivers/net/{phy => mdio}/mdio-octeon.c | 0
drivers/net/{phy => mdio}/mdio-sun4i.c | 0
drivers/net/{phy => mdio}/mdio-thunder.c | 0
drivers/net/{phy => mdio}/mdio-xgene.c | 2 +-
drivers/net/pcs/Kconfig | 20 +
drivers/net/pcs/Makefile | 4 +
.../net/{phy/mdio-xpcs.c => pcs/pcs-xpcs.c} | 2 +-
drivers/net/phy/Kconfig | 404 ++++--------------
drivers/net/phy/Makefile | 37 +-
drivers/net/phy/sfp.c | 2 +-
{drivers/net/phy => include/linux}/mdio-i2c.h | 0
.../net/phy => include/linux}/mdio-xgene.h | 0
include/linux/{mdio-xpcs.h => pcs-xpcs.h} | 8 +-
41 files changed, 403 insertions(+), 369 deletions(-)
create mode 100644 drivers/net/mdio/Kconfig
create mode 100644 drivers/net/mdio/Makefile
rename drivers/net/{phy => mdio}/mdio-aspeed.c (100%)
rename drivers/net/{phy => mdio}/mdio-bcm-iproc.c (100%)
rename drivers/net/{phy => mdio}/mdio-bcm-unimac.c (100%)
rename drivers/net/{phy => mdio}/mdio-bitbang.c (100%)
rename drivers/net/{phy => mdio}/mdio-cavium.c (100%)
rename drivers/net/{phy => mdio}/mdio-cavium.h (100%)
rename drivers/net/{phy => mdio}/mdio-gpio.c (100%)
rename drivers/net/{phy => mdio}/mdio-hisi-femac.c (100%)
rename drivers/net/{phy => mdio}/mdio-i2c.c (98%)
rename drivers/net/{phy => mdio}/mdio-ipq4019.c (100%)
rename drivers/net/{phy => mdio}/mdio-ipq8064.c (100%)
rename drivers/net/{phy => mdio}/mdio-moxart.c (100%)
rename drivers/net/{phy => mdio}/mdio-mscc-miim.c (100%)
rename drivers/net/{phy => mdio}/mdio-mux-bcm-iproc.c (100%)
rename drivers/net/{phy => mdio}/mdio-mux-gpio.c (100%)
rename drivers/net/{phy => mdio}/mdio-mux-meson-g12a.c (100%)
rename drivers/net/{phy => mdio}/mdio-mux-mmioreg.c (100%)
rename drivers/net/{phy => mdio}/mdio-mux-multiplexer.c (100%)
rename drivers/net/{phy => mdio}/mdio-mux.c (100%)
rename drivers/net/{phy => mdio}/mdio-mvusb.c (100%)
rename drivers/net/{phy => mdio}/mdio-octeon.c (100%)
rename drivers/net/{phy => mdio}/mdio-sun4i.c (100%)
rename drivers/net/{phy => mdio}/mdio-thunder.c (100%)
rename drivers/net/{phy => mdio}/mdio-xgene.c (99%)
create mode 100644 drivers/net/pcs/Kconfig
create mode 100644 drivers/net/pcs/Makefile
rename drivers/net/{phy/mdio-xpcs.c => pcs/pcs-xpcs.c} (99%)
rename {drivers/net/phy => include/linux}/mdio-i2c.h (100%)
rename {drivers/net/phy => include/linux}/mdio-xgene.h (100%)
rename include/linux/{mdio-xpcs.h => pcs-xpcs.h} (88%)
--
2.28.0
