diff options
| author |   Calvin Johnson <calvin.johnson@oss.nxp.com> | 2020-10-08 20:17:06 +0530 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2020-10-10 10:55:05 -0700 |
| commit | 14b26b127c098bbab9b364d90a007c478090bf5f (patch) | |
| tree | dc5ebda78522c79223900ebae49566bcb80bf553 /drivers | |
| parent | dpaa_eth: enable NETIF_MSG_HW by default (diff) | |
| download | linux-dev-14b26b127c098bbab9b364d90a007c478090bf5f.tar.xz linux-dev-14b26b127c098bbab9b364d90a007c478090bf5f.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/mdio/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/net/mdio/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/mdio/of_mdio.c (renamed from drivers/of/of_mdio.c) | 0 | ||||
| -rw-r--r-- | drivers/of/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/of/Makefile | 1 |
5 files changed, 10 insertions, 8 deletions
diff --git a/drivers/net/mdio/Kconfig b/drivers/net/mdio/Kconfig index 27a2a4a3d943..a10cc460d7cf 100644 --- 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 14d1beb633c9..5c498dde463f 100644 --- 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 index 4daf94bb56a5..4daf94bb56a5 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/net/mdio/of_mdio.c diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index d91618641be6..18450437d5d5 100644 --- 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 663a4af0cccd..6e1e5212f058 100644 --- 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 |