From 682a4ead16ed78f868a8b91dedda66d7ab5c6aee Mon Sep 17 00:00:00 2001 From: Manikanta Mylavarapu Date: Tue, 4 Jan 2022 11:34:06 +0530 Subject: [PATCH] ipq6018: update q6v5 node fdt fixup for atf This change support both legacy and current node configuration. Change-Id: I2a930950472119210961238d39dd00f9482cbe6e Signed-off-by: Manikanta Mylavarapu --- board/qca/arm/ipq6018/ipq6018.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/board/qca/arm/ipq6018/ipq6018.c b/board/qca/arm/ipq6018/ipq6018.c index 9e8d93598e..37e399a6ee 100644 --- a/board/qca/arm/ipq6018/ipq6018.c +++ b/board/qca/arm/ipq6018/ipq6018.c @@ -1383,8 +1383,12 @@ void fdt_fixup_set_qca_cold_reboot_enable(void *blob) void fdt_fixup_wcss_rproc_for_atf(void *blob) { - parse_fdt_fixup("/soc/qcom_q6v5_wcss@CD00000%qcom,nosecure%1", blob); - parse_fdt_fixup("/soc/qcom_q6v5_wcss@CD00000%qca,wcss-aon-reset-seq%1", blob); + if (fdt_path_offset(blob, "/soc/remoteproc@cd00000") >= 0) + parse_fdt_fixup("/soc/remoteproc@cd00000%qcom,nosecure%1", blob); + else { + parse_fdt_fixup("/soc/qcom_q6v5_wcss@CD00000%qcom,nosecure%1", blob); + parse_fdt_fixup("/soc/qcom_q6v5_wcss@CD00000%qca,wcss-aon-reset-seq%1", blob); + } } int get_soc_hw_version(void)