Skip to content

Commit

Permalink
net: phy: Move of_mdio from drivers/of to drivers/net/mdio
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Calvin Johnson authored and Jakub Kicinski committed Oct 10, 2020
1 parent fea9b31 commit 14b26b1
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions drivers/net/mdio/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions drivers/net/mdio/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
File renamed without changes.
7 changes: 0 additions & 7 deletions drivers/of/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion drivers/of/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 14b26b1

Please sign in to comment.