Skip to contentSkip to conversation

board: ti: am65x: Update fdt fixup logic for interconnect nodes

PATCH New Suman Anna 2 participants 2 messages Jul 29, 2020 – Aug 11, 2020

lore
Share & tools
lore

Suman Anna

author
#0 lore raw

PATCH v2 1/1 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.

---
v2: dropped the local variable due to its usage only in the conditional
CONFIG_TI_SECURE_DEVICE compilation path
v1: https://patchwork.ozlabs.org/project/uboot/patch/20200723225609.29404-1-s-anna at ti.com/

 board/ti/am65x/evm.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
board/ti/am65x/evm.c +8 -2
index 2eb8235c6988..36063b11383d 100644
@@ -101,7 +101,10 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 {
 	int ret;
 
-	ret = fdt_fixup_msmc_ram(blob, "/interconnect at 100000", "sram at 70000000");
+	ret = fdt_fixup_msmc_ram(blob, "/bus at 100000", "sram at 70000000");
+	if (ret < 0)
+		ret = fdt_fixup_msmc_ram(blob, "/interconnect at 100000",
+					 "sram at 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 at 100000/crypto at 4E00000");
+	ret = fdt_disable_node(blob, "/bus at 100000/crypto at 4e00000");
+	if (ret < 0)
+		ret = fdt_disable_node(blob,
+				       "/interconnect at 100000/crypto@4E00000");
 	if (ret)
 		printf("%s: disabling SA2UL failed %d\n", __func__, ret);
 #endif
Signature · 1 line
2.26.0
#1 lore raw

PATCH v2 1/1 board: ti: am65x: Update fdt fixup logic for interconnect nodes

Quoted 6 lines · Suman Anna

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.

Quoted 8 lines

The logic also corrects the crypto node name as the DT node unit-addresses are all expected to be lower case.

---
v2: dropped the local variable due to its usage only in the conditional
CONFIG_TI_SECURE_DEVICE compilation path
v1: https://patchwork.ozlabs.org/project/uboot/patch/20200723225609.29404-1-s-anna at ti.com/

Applied to u-boot-ti

Thanks and regards,
Lokesh