Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

net: use the same alias stem for ethernet as linux

Browse source 
Linux uses the prefix "ethernet" whereas u-boot uses "eth". This is from
the linux tree:

$ grep "eth[0-9].*=.*&" arch/**/*dts{,i}|wc -l
0
$ grep "ethernet[0-9].*=.*&" arch/**/*dts{,i}|wc -l
633

In u-boot device trees both prefixes are used. Until recently the only
user of the ethernet alias was the sandbox test device tree. This
changed with commit fc054d563b ("net: Introduce DSA class for Ethernet
switches"). There, the MAC addresses are inherited based on the devices
sequence IDs which is in turn given by the device tree.

Before there are more users in u-boot and both worlds will differ even
more, rename the alias prefix to "ethernet" to match the linux ones.
Also adapt the test cases and rename any old aliases in the u-boot
device trees.

Cc: David Wu <david.wu@rock-chips.com>
Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Michael Walle 2021-02-25 16:51:11 +01:00 committed by Ramon Fried
parent 6e424b4aca
commit 82a3c9ef20
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/arm/dts/fsl-ls1028a-rdb.dts
View file

@ -15,12 +15,12 @@
compatible = "fsl,ls1028a-rdb", "fsl,ls1028a"; compatible = "fsl,ls1028a-rdb", "fsl,ls1028a";
aliases { aliases {
spi0 = &fspi; spi0 = &fspi;
eth0 = &enetc0; ethernet0 = &enetc0;
eth1 = &enetc2; ethernet1 = &enetc2;
eth2 = &mscc_felix_port0; ethernet2 = &mscc_felix_port0;
eth3 = &mscc_felix_port1; ethernet3 = &mscc_felix_port1;
eth4 = &mscc_felix_port2; ethernet4 = &mscc_felix_port2;
eth5 = &mscc_felix_port3; ethernet5 = &mscc_felix_port3;
}; };
}; };

10
arch/sandbox/dts/test.dts
View file

@ -14,11 +14,11 @@
aliases { aliases {
console = &uart0; console = &uart0;
eth0 = "/eth@10002000"; ethernet0 = "/eth@10002000";
eth2 = &swp_0; ethernet2 = &swp_0;
eth3 = &eth_3; ethernet3 = &eth_3;
eth4 = &dsa_eth0; ethernet4 = &dsa_eth0;
eth5 = &eth_5; ethernet5 = &eth_5;
gpio1 = &gpio_a; gpio1 = &gpio_a;
gpio2 = &gpio_b; gpio2 = &gpio_b;
gpio3 = &gpio_c; gpio3 = &gpio_c;

4
net/eth-uclass.c
View file

@ -605,8 +605,8 @@ static int eth_pre_remove(struct udevice *dev)
return 0; return 0;
} }
UCLASS_DRIVER(eth) = { UCLASS_DRIVER(ethernet) = {
.name = "eth", .name = "ethernet",
.id = UCLASS_ETH, .id = UCLASS_ETH,
.post_bind = eth_post_bind, .post_bind = eth_post_bind,
.pre_unbind = eth_pre_unbind, .pre_unbind = eth_pre_unbind,

2
test/dm/ofnode.c
View file

@ -213,7 +213,7 @@ static int dm_test_ofnode_read_aliases(struct unit_test_state *uts)
ofnode node; ofnode node;
int size; int size;
node = ofnode_get_aliases_node("eth3"); node = ofnode_get_aliases_node("ethernet3");
ut_assert(ofnode_valid(node)); ut_assert(ofnode_valid(node));
ut_asserteq_str("sbe5", ofnode_get_name(node)); ut_asserteq_str("sbe5", ofnode_get_name(node));

2
test/dm/test-fdt.c
View file

@ -183,7 +183,7 @@ static int dm_test_alias_highest_id(struct unit_test_state *uts)
{ {
int ret; int ret;
ret = dev_read_alias_highest_id("eth"); ret = dev_read_alias_highest_id("ethernet");
ut_asserteq(5, ret); ut_asserteq(5, ret);
ret = dev_read_alias_highest_id("gpio"); ret = dev_read_alias_highest_id("gpio");