From fc4c380233962ff658a1e23c3455282dcd58a075 Mon Sep 17 00:00:00 2001 From: Suman Anna Date: Wed, 29 Jul 2020 13:41:12 -0500 Subject: [PATCH] board: ti: am65x: Update fdt fixup logic for interconnect nodes The DT nodes on AM65x SoCs currently use a node name "interconnect" for the various interconnects. This name is not following the DT schema, and should simply be "bus". Update the fdt fixup logic to use both the current and the expected corrected path names so that this logic won't be broken with newer kernels. The logic also corrects the crypto node name as the DT node unit-addresses are all expected to be lower case. Signed-off-by: Suman Anna --- board/ti/am65x/evm.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c index 2eb8235c69..36063b1138 100644 --- a/board/ti/am65x/evm.c +++ b/board/ti/am65x/evm.c @@ -101,7 +101,10 @@ int ft_board_setup(void *blob, struct bd_info *bd) { int ret; - ret = fdt_fixup_msmc_ram(blob, "/interconnect@100000", "sram@70000000"); + ret = fdt_fixup_msmc_ram(blob, "/bus@100000", "sram@70000000"); + if (ret < 0) + ret = fdt_fixup_msmc_ram(blob, "/interconnect@100000", + "sram@70000000"); if (ret) { printf("%s: fixing up msmc ram failed %d\n", __func__, ret); return ret; @@ -109,7 +112,10 @@ int ft_board_setup(void *blob, struct bd_info *bd) #if defined(CONFIG_TI_SECURE_DEVICE) /* Make Crypto HW reserved for secure world use */ - ret = fdt_disable_node(blob, "/interconnect@100000/crypto@4E00000"); + ret = fdt_disable_node(blob, "/bus@100000/crypto@4e00000"); + if (ret < 0) + ret = fdt_disable_node(blob, + "/interconnect@100000/crypto@4E00000"); if (ret) printf("%s: disabling SA2UL failed %d\n", __func__, ret); #endif -- 2.39.5