sandbox: net: Add aliases for ethernet devices

Commit f3dd213e15 ("net: introduce helpers to get PHY ofnode from MAC")
changed the ethernet sequence assignment from

uclass 36: ethernet
0   * eth@10002000 @ 05813460, seq 0
1   * eth@10003000 @ 05813550, seq 5
2   * sbe5 @ 05813640, seq 3
3   * eth@10004000 @ 05813730, seq 6
4   * dsa-test-eth @ 05813820, seq 4
5   * lan0 @ 05813a30, seq 2
6   * lan1 @ 05813b50, seq 7

to

uclass 36: ethernet
0   * eth@10002000 @ 03813630, seq 0
1   * eth@10003000 @ 03813720, seq 5
2   * sbe5 @ 03813810, seq 3
3   * eth@10004000 @ 03813900, seq 6
4     phy-test-eth @ 038139f0, seq 7
5   * dsa-test-eth @ 03813ae0, seq 4
6   * lan0 @ 03813cf0, seq 2
7   * lan1 @ 03813e10, seq 8

This caused the mac address assignment to switch around. Avoid this in
the future by assigning aliases for all ethernet devices. This reverts
the sequence to what it was before the aformentioned commit (with
phy-test-eth as seq 8). There is no ethernet1 for whatever reason.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 8f93775ff4a312494c3cb50f801453e46cecdd1b..39d57f51102199f16ef8dfea712ecbddaf043b62 100644 (file)
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -28,6 +28,9 @@
                ethernet3 = &eth_3;
                ethernet4 = &dsa_eth0;
                ethernet5 = &eth_5;
+               ethernet6 = "/eth@10004000";
+               ethernet7 = &swp_1;
+               ethernet8 = &phy_eth0;
                gpio1 = &gpio_a;
                gpio2 = &gpio_b;
                gpio3 = &gpio_c;

diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c
index e1de066226cb39bcd3931cdd47e5d76212cb1160..f9e817475959a74b8afb11bff259cb6a28a06792 100644 (file)
--- a/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
@@ -184,7 +184,7 @@ static int dm_test_alias_highest_id(struct unit_test_state *uts)
        int ret;
 
        ret = dev_read_alias_highest_id("ethernet");
-       ut_asserteq(5, ret);
+       ut_asserteq(8, ret);
 
        ret = dev_read_alias_highest_id("gpio");
        ut_asserteq(3, ret);