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 <[email protected]>
---
MAINTAINERS | 2 +-
drivers/net/mdio/Kconfig | 8 ++++++++
drivers/net/mdio/Makefile | 2 ++
drivers/{of => net/mdio}/of_mdio.c | 0
drivers/of/Kconfig | 7 -------
drivers/of/Makefile | 1 -
6 files changed, 11 insertions(+), 9 deletions(-)
rename drivers/{of => net/mdio}/of_mdio.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 8ff71b1a4a99..d1b82a3a1843 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6525,9 +6525,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 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
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 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
--
2.17.1
On 08/10/2020 15:47, Calvin Johnson wrote:
> 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 <[email protected]>
In-Principle-Acked-By: Grant Likely <[email protected]>
... but I've not tested or compiled *anything*!
g.
> ---
>
> MAINTAINERS | 2 +-
> drivers/net/mdio/Kconfig | 8 ++++++++
> drivers/net/mdio/Makefile | 2 ++
> drivers/{of => net/mdio}/of_mdio.c | 0
> drivers/of/Kconfig | 7 -------
> drivers/of/Makefile | 1 -
> 6 files changed, 11 insertions(+), 9 deletions(-)
> rename drivers/{of => net/mdio}/of_mdio.c (100%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 8ff71b1a4a99..d1b82a3a1843 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -6525,9 +6525,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 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
> 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 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
>
On Thu, Oct 8, 2020 at 9:47 AM Calvin Johnson
<[email protected]> wrote:
>
> Better place for of_mdio.c is drivers/net/mdio.
> Move of_mdio.c from drivers/of to drivers/net/mdio
One thing off my todo list. I'd started this ages ago[1].
>
> Signed-off-by: Calvin Johnson <[email protected]>
> ---
>
> MAINTAINERS | 2 +-
> drivers/net/mdio/Kconfig | 8 ++++++++
> drivers/net/mdio/Makefile | 2 ++
> drivers/{of => net/mdio}/of_mdio.c | 0
> drivers/of/Kconfig | 7 -------
> drivers/of/Makefile | 1 -
> 6 files changed, 11 insertions(+), 9 deletions(-)
> rename drivers/{of => net/mdio}/of_mdio.c (100%)
of_mdio.c is really a combination of mdio and phylib functions, so it
should be split up IMO. With that, I think you can get rid of
CONFIG_OF_MDIO. See my branch[1] for what I had in mind. But that can
be done after this if the net maintainers prefer.
Acked-by: Rob Herring <[email protected]>
Rob
[1] git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git dt/move-net
On 10/8/2020 7:20 PM, Calvin Johnson wrote:
> Hi Rob,
>
> On Thu, Oct 08, 2020 at 11:35:07AM -0500, Rob Herring wrote:
>> On Thu, Oct 8, 2020 at 9:47 AM Calvin Johnson
>> <[email protected]> wrote:
>>>
>>> Better place for of_mdio.c is drivers/net/mdio.
>>> Move of_mdio.c from drivers/of to drivers/net/mdio
>>
>> One thing off my todo list. I'd started this ages ago[1].
>>
>>>
>>> Signed-off-by: Calvin Johnson <[email protected]>
>>> ---
>>>
>>> MAINTAINERS | 2 +-
>>> drivers/net/mdio/Kconfig | 8 ++++++++
>>> drivers/net/mdio/Makefile | 2 ++
>>> drivers/{of => net/mdio}/of_mdio.c | 0
>>> drivers/of/Kconfig | 7 -------
>>> drivers/of/Makefile | 1 -
>>> 6 files changed, 11 insertions(+), 9 deletions(-)
>>> rename drivers/{of => net/mdio}/of_mdio.c (100%)
>>
>> of_mdio.c is really a combination of mdio and phylib functions, so it
>> should be split up IMO. With that, I think you can get rid of
>> CONFIG_OF_MDIO. See my branch[1] for what I had in mind. But that can
>> be done after this if the net maintainers prefer.
>>
>> Acked-by: Rob Herring <[email protected]>
>>
>> Rob
>>
>> [1] git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git dt/move-net
>
> Makes sense to me to split of_mdio.c. I can work on it once my current task
> completes.
If you could take Rob's patches, given then a round of randconfig build
tests and update the MAINTAINERS file (no more drivers/of/of_mdio.c),
then this looks like the right approach to me. Thanks!
--
Florian
Hi Rob,
On Thu, Oct 08, 2020 at 11:35:07AM -0500, Rob Herring wrote:
> On Thu, Oct 8, 2020 at 9:47 AM Calvin Johnson
> <[email protected]> wrote:
> >
> > Better place for of_mdio.c is drivers/net/mdio.
> > Move of_mdio.c from drivers/of to drivers/net/mdio
>
> One thing off my todo list. I'd started this ages ago[1].
>
> >
> > Signed-off-by: Calvin Johnson <[email protected]>
> > ---
> >
> > MAINTAINERS | 2 +-
> > drivers/net/mdio/Kconfig | 8 ++++++++
> > drivers/net/mdio/Makefile | 2 ++
> > drivers/{of => net/mdio}/of_mdio.c | 0
> > drivers/of/Kconfig | 7 -------
> > drivers/of/Makefile | 1 -
> > 6 files changed, 11 insertions(+), 9 deletions(-)
> > rename drivers/{of => net/mdio}/of_mdio.c (100%)
>
> of_mdio.c is really a combination of mdio and phylib functions, so it
> should be split up IMO. With that, I think you can get rid of
> CONFIG_OF_MDIO. See my branch[1] for what I had in mind. But that can
> be done after this if the net maintainers prefer.
>
> Acked-by: Rob Herring <[email protected]>
>
> Rob
>
> [1] git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git dt/move-net
Makes sense to me to split of_mdio.c. I can work on it once my current task
completes.
Regards
Calvin
Hi Florian,
On Thu, Oct 08, 2020 at 07:26:44PM -0700, Florian Fainelli wrote:
>
>
> On 10/8/2020 7:20 PM, Calvin Johnson wrote:
> > Hi Rob,
> >
> > On Thu, Oct 08, 2020 at 11:35:07AM -0500, Rob Herring wrote:
> > > On Thu, Oct 8, 2020 at 9:47 AM Calvin Johnson
> > > <[email protected]> wrote:
> > > >
> > > > Better place for of_mdio.c is drivers/net/mdio.
> > > > Move of_mdio.c from drivers/of to drivers/net/mdio
> > >
> > > One thing off my todo list. I'd started this ages ago[1].
> > >
> > > >
> > > > Signed-off-by: Calvin Johnson <[email protected]>
> > > > ---
> > > >
> > > > MAINTAINERS | 2 +-
> > > > drivers/net/mdio/Kconfig | 8 ++++++++
> > > > drivers/net/mdio/Makefile | 2 ++
> > > > drivers/{of => net/mdio}/of_mdio.c | 0
> > > > drivers/of/Kconfig | 7 -------
> > > > drivers/of/Makefile | 1 -
> > > > 6 files changed, 11 insertions(+), 9 deletions(-)
> > > > rename drivers/{of => net/mdio}/of_mdio.c (100%)
> > >
> > > of_mdio.c is really a combination of mdio and phylib functions, so it
> > > should be split up IMO. With that, I think you can get rid of
> > > CONFIG_OF_MDIO. See my branch[1] for what I had in mind. But that can
> > > be done after this if the net maintainers prefer.
> > >
> > > Acked-by: Rob Herring <[email protected]>
> > >
> > > Rob
> > >
> > > [1] git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git dt/move-net
> >
> > Makes sense to me to split of_mdio.c. I can work on it once my current task
> > completes.
>
> If you could take Rob's patches, given then a round of randconfig build
> tests and update the MAINTAINERS file (no more drivers/of/of_mdio.c), then
> this looks like the right approach to me. Thanks!
I gave a quick try with those patches and it needs some more work to apply
as they are bit old. I can look into this later afer the ACPI work is done.
For now, this patch is good to merge as I've done some sanity.
Thanks
Calvin
On Thu, 8 Oct 2020 20:17:06 +0530 Calvin Johnson wrote:
> 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 <[email protected]>
Applied, thank you.