nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

of: net: move of_net under net/

Browse source 
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>
This commit is contained in:
Jakub Kicinski 2021-10-06 18:06:54 -07:00 committed by David S. Miller
parent 944b33ca7b
commit e330fb1459
11 changed files with 9 additions and 13 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/ethernet/amd/Kconfig
View file

@ -168,7 +168,7 @@ config SUNLANCE
config AMD_XGBE config AMD_XGBE
tristate "AMD 10GbE Ethernet driver" 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 X86 || ARM64 || COMPILE_TEST
depends on PTP_1588_CLOCK_OPTIONAL depends on PTP_1588_CLOCK_OPTIONAL
select BITREVERSE select BITREVERSE

4
drivers/net/ethernet/arc/Kconfig
View file

@ -25,7 +25,7 @@ config ARC_EMAC_CORE
config ARC_EMAC config ARC_EMAC
tristate "ARC EMAC support" tristate "ARC EMAC support"
select ARC_EMAC_CORE select ARC_EMAC_CORE
depends on OF_IRQ && OF_NET depends on OF_IRQ
depends on ARC || COMPILE_TEST depends on ARC || COMPILE_TEST
help help
On some legacy ARC (Synopsys) FPGA boards such as ARCAngel4/ML50x On some legacy ARC (Synopsys) FPGA boards such as ARCAngel4/ML50x
@ -35,7 +35,7 @@ config ARC_EMAC
config EMAC_ROCKCHIP config EMAC_ROCKCHIP
tristate "Rockchip EMAC support" tristate "Rockchip EMAC support"
select ARC_EMAC_CORE select ARC_EMAC_CORE
depends on OF_IRQ && OF_NET && REGULATOR depends on OF_IRQ && REGULATOR
depends on ARCH_ROCKCHIP || COMPILE_TEST depends on ARCH_ROCKCHIP || COMPILE_TEST
help help
Support for Rockchip RK3036/RK3066/RK3188 EMAC ethernet controllers. Support for Rockchip RK3036/RK3066/RK3188 EMAC ethernet controllers.

2
drivers/net/ethernet/ezchip/Kconfig
View file

@ -18,7 +18,7 @@ if NET_VENDOR_EZCHIP
config EZCHIP_NPS_MANAGEMENT_ENET config EZCHIP_NPS_MANAGEMENT_ENET
tristate "EZchip NPS management enet support" tristate "EZchip NPS management enet support"
depends on OF_IRQ && OF_NET depends on OF_IRQ
depends on HAS_IOMEM depends on HAS_IOMEM
help help
Simple LAN device for debug or management purposes. Simple LAN device for debug or management purposes.

2
drivers/net/ethernet/litex/Kconfig
View file

@ -17,7 +17,7 @@ if NET_VENDOR_LITEX
config LITEX_LITEETH config LITEX_LITEETH
tristate "LiteX Ethernet support" tristate "LiteX Ethernet support"
depends on OF_NET depends on OF
help help
If you wish to compile a kernel for hardware with a LiteX LiteEth If you wish to compile a kernel for hardware with a LiteX LiteEth
device then you should answer Y to this. device then you should answer Y to this.

2
drivers/net/ethernet/mscc/Kconfig
View file

@ -28,7 +28,7 @@ config MSCC_OCELOT_SWITCH
depends on BRIDGE || BRIDGE=n depends on BRIDGE || BRIDGE=n
depends on NET_SWITCHDEV depends on NET_SWITCHDEV
depends on HAS_IOMEM depends on HAS_IOMEM
depends on OF_NET depends on OF
select MSCC_OCELOT_SWITCH_LIB select MSCC_OCELOT_SWITCH_LIB
select GENERIC_PHY select GENERIC_PHY
help help

4
drivers/of/Kconfig
View file

@ -70,10 +70,6 @@ config OF_IRQ
def_bool y def_bool y
depends on !SPARC && IRQ_DOMAIN depends on !SPARC && IRQ_DOMAIN
config OF_NET
depends on NETDEVICES
def_bool y
config OF_RESERVED_MEM config OF_RESERVED_MEM
def_bool OF_EARLY_FLATTREE def_bool OF_EARLY_FLATTREE

1
drivers/of/Makefile
View file

@ -7,7 +7,6 @@ obj-$(CONFIG_OF_EARLY_FLATTREE) += fdt_address.o
obj-$(CONFIG_OF_PROMTREE) += pdt.o obj-$(CONFIG_OF_PROMTREE) += pdt.o
obj-$(CONFIG_OF_ADDRESS) += address.o obj-$(CONFIG_OF_ADDRESS) += address.o
obj-$(CONFIG_OF_IRQ) += irq.o obj-$(CONFIG_OF_IRQ) += irq.o
obj-$(CONFIG_OF_NET) += of_net.o
obj-$(CONFIG_OF_UNITTEST) += unittest.o obj-$(CONFIG_OF_UNITTEST) += unittest.o
obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
obj-$(CONFIG_OF_RESOLVE) += resolver.o obj-$(CONFIG_OF_RESOLVE) += resolver.o

2
include/linux/of_net.h
View file

@ -8,7 +8,7 @@
#include <linux/phy.h> #include <linux/phy.h>
#ifdef CONFIG_OF_NET #ifdef CONFIG_OF
#include <linux/of.h> #include <linux/of.h>
struct net_device; struct net_device;

1
net/core/Makefile
View file

@ -36,3 +36,4 @@ obj-$(CONFIG_FAILOVER) += failover.o
obj-$(CONFIG_NET_SOCK_MSG) += skmsg.o obj-$(CONFIG_NET_SOCK_MSG) += skmsg.o
obj-$(CONFIG_BPF_SYSCALL) += sock_map.o obj-$(CONFIG_BPF_SYSCALL) += sock_map.o
obj-$(CONFIG_BPF_SYSCALL) += bpf_sk_storage.o obj-$(CONFIG_BPF_SYSCALL) += bpf_sk_storage.o
obj-$(CONFIG_OF) += of_net.o

2
net/core/net-sysfs.c
View file

@ -1869,7 +1869,7 @@ static struct class net_class __ro_after_init = {
.get_ownership = net_get_ownership, .get_ownership = net_get_ownership,
}; };
#ifdef CONFIG_OF_NET #ifdef CONFIG_OF
static int of_dev_node_match(struct device *dev, const void *data) static int of_dev_node_match(struct device *dev, const void *data)
{ {
for (; dev; dev = dev->parent) { for (; dev; dev = dev->parent) {

0
drivers/of/of_net.c → net/core/of_net.c
View file