Skip to contentSkip to conversation

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

PATCH Applied Calvin Johnson 5 participants 7 messages Oct 8, 2020 – Oct 10, 2020

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

---

 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%)
MAINTAINERS +1 -1
index 8ff71b1a4a99..d1b82a3a1843 100644
@@ -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
drivers/net/mdio/Kconfig +8 -0
index 27a2a4a3d943..a10cc460d7cf 100644
@@ -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
drivers/net/mdio/Makefile +2 -0
index 14d1beb633c9..5c498dde463f 100644
@@ -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
drivers/net/mdio/of_mdio.c renamed from drivers/of/of_mdio.c +0 -0
similarity index 100%
rename from drivers/of/of_mdio.c
rename to drivers/net/mdio/of_mdio.c
drivers/of/Kconfig +0 -7
index d91618641be6..18450437d5d5 100644
@@ -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
drivers/of/Makefile +0 -1
index 663a4af0cccd..6e1e5212f058 100644
@@ -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
Signature · 1 line
2.17.1
#1 lore raw
Quoted 4 lines · Calvin Johnson

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

In-Principle-Acked-By Grant Likely <[email protected]>

... but I've not tested or compiled *anything*!

g.

Quoted 93 lines

---

  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%)

MAINTAINERS +1 -1
index 8ff71b1a4a99..d1b82a3a1843 100644
@@ -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
drivers/net/mdio/Kconfig +8 -0
index 27a2a4a3d943..a10cc460d7cf 100644
@@ -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
drivers/net/mdio/Makefile +2 -0
index 14d1beb633c9..5c498dde463f 100644
@@ -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
drivers/net/mdio/of_mdio.c renamed from drivers/of/of_mdio.c +0 -0
similarity index 100%
rename from drivers/of/of_mdio.c
rename to drivers/net/mdio/of_mdio.c
drivers/of/Kconfig +0 -7
index d91618641be6..18450437d5d5 100644
@@ -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
drivers/of/Makefile +0 -1
index 663a4af0cccd..6e1e5212f058 100644
@@ -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
Acked-by on v1 1/1
#2 lore raw
In reply to Calvin Johnson
Quoted 3 lines · Calvin Johnson

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].

Quoted 4 lines

---

Quoted 8 lines
 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.

Rob

[1] git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git dt/move-net

#3 lore raw

Hi Rob,

Quoted 26 lines · Rob Herring
Quoted 3 lines · Calvin Johnson

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].

Quoted 4 lines

---

Quoted 8 lines
 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.

Quoted 5 lines

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

#4 lore raw
Quoted 29 lines · Calvin Johnson

Hi Rob,

Quoted 26 lines · Rob Herring
Quoted 3 lines · Calvin Johnson

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].

Quoted 4 lines

---

Quoted 8 lines
  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.

Quoted 8 lines
Quoted 5 lines

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!

Signature · 1 line
Florian
#5 lore raw

Hi Florian,

Quoted 36 lines · Florian Fainelli
Quoted 33 lines · Calvin Johnson

Hi Rob,

Quoted 30 lines · Rob Herring
Quoted 3 lines · Calvin Johnson

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].

Quoted 4 lines

---

Quoted 8 lines
  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.

Rob

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

[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