From 1af0aaf36d19ca49163f32197f682035f8f6140d Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Fri, 9 Aug 2019 07:15:09 +0200 Subject: [PATCH] arm: baltos: use device tree alias to access Ethernet slave The full path has changed in the recent kernels so that it is not possible to load them. Aliases "ethernet0" and "ethernet1" are still present in both legacy and new kernels. Also, fix error messages to correspond to the taken actions. Signed-off-by: Yegor Yefremov --- board/vscom/baltos/board.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c index c5949ad267..036a356578 100644 --- a/board/vscom/baltos/board.c +++ b/board/vscom/baltos/board.c @@ -288,15 +288,15 @@ int ft_board_setup(void *blob, bd_t *bd) mac_addr[5] = header.MAC1[5]; - node = fdt_path_offset(blob, "/ocp/ethernet/slave@4a100200"); + node = fdt_path_offset(blob, "ethernet0"); if (node < 0) { - printf("no /soc/fman/ethernet path offset\n"); + printf("no ethernet0 path offset\n"); return -ENODEV; } ret = fdt_setprop(blob, node, "mac-address", &mac_addr, 6); if (ret) { - printf("error setting local-mac-address property\n"); + printf("error setting mac-address property\n"); return -ENODEV; } @@ -308,15 +308,15 @@ int ft_board_setup(void *blob, bd_t *bd) mac_addr[4] = header.MAC2[4]; mac_addr[5] = header.MAC2[5]; - node = fdt_path_offset(blob, "/ocp/ethernet/slave@4a100300"); + node = fdt_path_offset(blob, "ethernet1"); if (node < 0) { - printf("no /soc/fman/ethernet path offset\n"); + printf("no ethernet1 path offset\n"); return -ENODEV; } ret = fdt_setprop(blob, node, "mac-address", &mac_addr, 6); if (ret) { - printf("error setting local-mac-address property\n"); + printf("error setting mac-address property\n"); return -ENODEV; } -- 2.17.0