瀏覽代碼

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 <s-anna@ti.com>
Suman Anna 3 年之前
父節點
當前提交
fc4c380233
共有 1 個文件被更改,包括 8 次插入2 次删除
  1. 8 2
      board/ti/am65x/evm.c

+ 8 - 2
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