net: phy: Move of_mdio from drivers/of to drivers/net/mdio

Better place for of_mdio.c is drivers/net/mdio.
Move of_mdio.c from drivers/of to drivers/net/mdio

Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 19a7b59ec456b033a76edbb5abc2bd2f9da6db06..c80f87d7258c5d29bb0b63f9d2ccbbf797ced25b 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6531,9 +6531,9 @@ 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/mdio/of_mdio.c
 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

diff --git a/drivers/net/mdio/Kconfig b/drivers/net/mdio/Kconfig
index 27a2a4a3d9439739e43fc2c6c57d4d756f88c4cc..a10cc460d7cf8cb34f2e014e498e86d0bc62efb5 100644 (file)
--- a/drivers/net/mdio/Kconfig
+++ b/drivers/net/mdio/Kconfig
@@ -19,6 +19,14 @@ config MDIO_BUS
          reflects whether the mdio_bus/mdio_device code is built as a
          loadable module or built-in.
 
+config OF_MDIO
+       def_tristate PHYLIB
+       depends on OF
+       depends on PHYLIB
+       select FIXED_PHY
+       help
+         OpenFirmware MDIO bus (Ethernet PHY) accessors
+
 if MDIO_BUS
 
 config MDIO_DEVRES

diff --git a/drivers/net/mdio/Makefile b/drivers/net/mdio/Makefile
index 14d1beb633c9f3398417bb3a2562dfab83337b3a..5c498dde463ffcdde75b8fe0151785a64ecb9591 100644 (file)
--- a/drivers/net/mdio/Makefile
+++ b/drivers/net/mdio/Makefile
@@ -1,6 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0
 # Makefile for Linux MDIO bus drivers
 
+obj-$(CONFIG_OF_MDIO)  += of_mdio.o
+
 obj-$(CONFIG_MDIO_ASPEED)              += mdio-aspeed.o
 obj-$(CONFIG_MDIO_BCM_IPROC)           += mdio-bcm-iproc.o
 obj-$(CONFIG_MDIO_BCM_UNIMAC)          += mdio-bcm-unimac.o

diff --git a/drivers/of/of_mdio.c b/drivers/net/mdio/of_mdio.c
similarity index 100%
rename from drivers/of/of_mdio.c
rename to drivers/net/mdio/of_mdio.c

diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index d91618641be693bb7448ccda99799c7bf37d193e..18450437d5d5ae8265291a4685d5b269a1985214 100644 (file)
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -74,13 +74,6 @@ config OF_NET
        depends on NETDEVICES
        def_bool y
 
-config OF_MDIO
-       def_tristate PHYLIB
-       depends on PHYLIB
-       select FIXED_PHY
-       help
-         OpenFirmware MDIO bus (Ethernet PHY) accessors
-
 config OF_RESERVED_MEM
        bool
        depends on OF_EARLY_FLATTREE

diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index 663a4af0cccd5cc5a91210a9983c1817c5f219ab..6e1e5212f05895ee3e67bd5b10f0f25f4fefb92a 100644 (file)
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -9,7 +9,6 @@ obj-$(CONFIG_OF_ADDRESS)  += address.o
 obj-$(CONFIG_OF_IRQ)    += irq.o
 obj-$(CONFIG_OF_NET)   += of_net.o
 obj-$(CONFIG_OF_UNITTEST) += unittest.o
-obj-$(CONFIG_OF_MDIO)  += of_mdio.o
 obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
 obj-$(CONFIG_OF_RESOLVE)  += resolver.o
 obj-$(CONFIG_OF_OVERLAY) += overlay.o