From 896eec92715d7062963d92bedd7dc61d643df1ea Mon Sep 17 00:00:00 2001 From: Emanuele Ghidoli Date: Mon, 22 Apr 2024 15:36:09 +0200 Subject: board: ti: Fix call to fdt_fixup_msmc_ram Substitute failing calls to fdt_fixup_msmc_ram function by calling fdt_fixup_msmc_ram_k3 function which was implemented in commit [1]. At functional level nothing changes. [1] b6e669d7a393 ("arm: k3: Fix ft_system_setup so it can be enabled on any SoC") Upstream-Status: Inappropriate Commit [1] is already upstreamed and the new function is already used when new boards were added. Signed-off-by: Emanuele Ghidoli --- board/ti/am65x/evm.c | 5 +---- board/ti/j721e/evm.c | 7 +------ board/ti/j721s2/evm.c | 7 +------ board/ti/j784s4/evm.c | 7 +------ 4 files changed, 4 insertions(+), 22 deletions(-) diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c index 48dc1af9aa..8a536f5b97 100644 --- a/board/ti/am65x/evm.c +++ b/board/ti/am65x/evm.c @@ -80,10 +80,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) { int ret; - ret = fdt_fixup_msmc_ram(blob, "/bus@100000", "sram@70000000"); - if (ret < 0) - ret = fdt_fixup_msmc_ram(blob, "/interconnect@100000", - "sram@70000000"); + ret = fdt_fixup_msmc_ram_k3(blob); if (ret) { printf("%s: fixing up msmc ram failed %d\n", __func__, ret); return ret; diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c index 313c1cb034..1f5cb4f6ae 100644 --- a/board/ti/j721e/evm.c +++ b/board/ti/j721e/evm.c @@ -128,12 +128,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) { int ret; - 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); + ret = fdt_fixup_msmc_ram_k3(blob); detect_enable_hyperflash(blob); diff --git a/board/ti/j721s2/evm.c b/board/ti/j721s2/evm.c index 1bde20a17d..efbd93b9b4 100644 --- a/board/ti/j721s2/evm.c +++ b/board/ti/j721s2/evm.c @@ -91,12 +91,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) { int ret; - 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); + ret = fdt_fixup_msmc_ram_k3(blob); detect_enable_spinand(blob); diff --git a/board/ti/j784s4/evm.c b/board/ti/j784s4/evm.c index 7e7f4a5593..8dec013ddb 100644 --- a/board/ti/j784s4/evm.c +++ b/board/ti/j784s4/evm.c @@ -90,12 +90,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) { int ret; - 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); + ret = fdt_fixup_msmc_ram_k3(blob); detect_enable_spinand(blob); -- cgit v1.2.3