of: net: move of_net under net/

Rob suggests to move of_net.c from under drivers/of/ somewhere
to the networking code.

Suggested-by: Rob Herring <robh@kernel.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig
index 4786f0504691d665126e7641987ecb89b2c44191..899c8a2a34b6ba0a316f79581b5aaa9d00a009e6 100644 (file)
--- a/drivers/net/ethernet/amd/Kconfig
+++ b/drivers/net/ethernet/amd/Kconfig
@@ -168,7 +168,7 @@ config SUNLANCE
 
 config AMD_XGBE
        tristate "AMD 10GbE Ethernet driver"
-       depends on ((OF_NET && OF_ADDRESS) || ACPI || PCI) && HAS_IOMEM
+       depends on (OF_ADDRESS || ACPI || PCI) && HAS_IOMEM
        depends on X86 || ARM64 || COMPILE_TEST
        depends on PTP_1588_CLOCK_OPTIONAL
        select BITREVERSE

diff --git a/drivers/net/ethernet/arc/Kconfig b/drivers/net/ethernet/arc/Kconfig
index 37a41773dd4350d96fded737601db7afef3ee521..840a9ce7ba1c2e741c3b3007d33def5dfba26db2 100644 (file)
--- a/drivers/net/ethernet/arc/Kconfig
+++ b/drivers/net/ethernet/arc/Kconfig
@@ -25,7 +25,7 @@ config ARC_EMAC_CORE
 config ARC_EMAC
        tristate "ARC EMAC support"
        select ARC_EMAC_CORE
-       depends on OF_IRQ && OF_NET
+       depends on OF_IRQ
        depends on ARC || COMPILE_TEST
        help
          On some legacy ARC (Synopsys) FPGA boards such as ARCAngel4/ML50x
@@ -35,7 +35,7 @@ config ARC_EMAC
 config EMAC_ROCKCHIP
        tristate "Rockchip EMAC support"
        select ARC_EMAC_CORE
-       depends on OF_IRQ && OF_NET && REGULATOR
+       depends on OF_IRQ && REGULATOR
        depends on ARCH_ROCKCHIP || COMPILE_TEST
        help
          Support for Rockchip RK3036/RK3066/RK3188 EMAC ethernet controllers.

diff --git a/drivers/net/ethernet/ezchip/Kconfig b/drivers/net/ethernet/ezchip/Kconfig
index 38aa824efb25de663a1d6431d83d1e68abf9b0dd..9241b9b1c7a366caa16f056f530e304656226c7a 100644 (file)
--- a/drivers/net/ethernet/ezchip/Kconfig
+++ b/drivers/net/ethernet/ezchip/Kconfig
@@ -18,7 +18,7 @@ if NET_VENDOR_EZCHIP
 
 config EZCHIP_NPS_MANAGEMENT_ENET
        tristate "EZchip NPS management enet support"
-       depends on OF_IRQ && OF_NET
+       depends on OF_IRQ
        depends on HAS_IOMEM
        help
          Simple LAN device for debug or management purposes.

diff --git a/drivers/net/ethernet/litex/Kconfig b/drivers/net/ethernet/litex/Kconfig
index 63bf01d28f0cf0844b195767458a4e9b0afde5ff..f99adbf26ab4e355914d774e873a7b893f6b530c 100644 (file)
--- a/drivers/net/ethernet/litex/Kconfig
+++ b/drivers/net/ethernet/litex/Kconfig
@@ -17,7 +17,7 @@ if NET_VENDOR_LITEX
 
 config LITEX_LITEETH
        tristate "LiteX Ethernet support"
-       depends on OF_NET
+       depends on OF
        help
          If you wish to compile a kernel for hardware with a LiteX LiteEth
          device then you should answer Y to this.

diff --git a/drivers/net/ethernet/mscc/Kconfig b/drivers/net/ethernet/mscc/Kconfig
index b6a73d151dec11a09d273065319ece300f8f6cea..8dd8c7f425d2c93a43dbec9311c91296cbd1d581 100644 (file)
--- a/drivers/net/ethernet/mscc/Kconfig
+++ b/drivers/net/ethernet/mscc/Kconfig
@@ -28,7 +28,7 @@ config MSCC_OCELOT_SWITCH
        depends on BRIDGE || BRIDGE=n
        depends on NET_SWITCHDEV
        depends on HAS_IOMEM
-       depends on OF_NET
+       depends on OF
        select MSCC_OCELOT_SWITCH_LIB
        select GENERIC_PHY
        help

diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 3dfeae8912dfc43839bc4d87e0c9985ecd02cb9f..80b5fd44ab1c7f057f36529af36f53da7f805d57 100644 (file)
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -70,10 +70,6 @@ config OF_IRQ
        def_bool y
        depends on !SPARC && IRQ_DOMAIN
 
-config OF_NET
-       depends on NETDEVICES
-       def_bool y
-
 config OF_RESERVED_MEM
        def_bool OF_EARLY_FLATTREE
 

diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index c13b982084a3a9e9ea4c118a96a3d73905dbb558..e0360a44306e29f71ad94b91b854147823ef8a24 100644 (file)
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -7,7 +7,6 @@ obj-$(CONFIG_OF_EARLY_FLATTREE) += fdt_address.o
 obj-$(CONFIG_OF_PROMTREE) += pdt.o
 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_RESERVED_MEM) += of_reserved_mem.o
 obj-$(CONFIG_OF_RESOLVE)  += resolver.o

diff --git a/include/linux/of_net.h b/include/linux/of_net.h
index daef3b0d9270de0836852099527d3bff2bc81c08..cf31188329b5a4933cc755bd8cb23cac81a34ea4 100644 (file)
--- a/include/linux/of_net.h
+++ b/include/linux/of_net.h
@@ -8,7 +8,7 @@
 
 #include <linux/phy.h>
 
-#ifdef CONFIG_OF_NET
+#ifdef CONFIG_OF
 #include <linux/of.h>
 
 struct net_device;

diff --git a/net/core/Makefile b/net/core/Makefile
index 35ced6201814c15772297b51c924b6b5bd04c7f0..4268846f2f4759b4dbd759ea7206287781ef9a3d 100644 (file)
--- a/net/core/Makefile
+++ b/net/core/Makefile
@@ -36,3 +36,4 @@ obj-$(CONFIG_FAILOVER) += failover.o
 obj-$(CONFIG_NET_SOCK_MSG) += skmsg.o
 obj-$(CONFIG_BPF_SYSCALL) += sock_map.o
 obj-$(CONFIG_BPF_SYSCALL) += bpf_sk_storage.o
+obj-$(CONFIG_OF)       += of_net.o

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index f6197774048b62460eebe9f34b4c01c8c7e2722d..ae001c2ca2af610def89da6a7ab32a336db189c2 100644 (file)
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -1869,7 +1869,7 @@ static struct class net_class __ro_after_init = {
        .get_ownership = net_get_ownership,
 };
 
-#ifdef CONFIG_OF_NET
+#ifdef CONFIG_OF
 static int of_dev_node_match(struct device *dev, const void *data)
 {
        for (; dev; dev = dev->parent) {

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