From: Sinthu Raja <sinthu.raja@ti.com>
Date: Mon, 3 Apr 2023 17:03:12 +0000 (-0500)
Subject: arm: dts: k3-j721e-sk-u-boot: fix boot on j721e SK
X-Git-Tag: baikal/mips/sdk5.8.2~5^2~1
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=2d215944dc62ed7beb8d800df044c9173d1ff482;p=uboot.git

arm: dts: k3-j721e-sk-u-boot: fix boot on j721e SK

J721e SK has been broken since at least March 2022.

The main-navss and mcu-navss nodes were renamed and this caused the
A72 SPL to fail early in the boot even before the serial port was
enabled. Fix this.

A later patch series between v2022.07 and v2022.10 additionally broke
boot on this board by introducing hbmc nodes which are not present on
this board. The right fix is to disable these by default in the SOC
dtsi file, but for now we can also disable them in the u-boot dtsi.

With both these fixed, we can now boot the j721e SK board fully from
mainline u-boot.

Fixes: 2cf228cb76835 ("arm: dts: k3-j721e-sk: Add initial A72 specific dts support")
Fixes: bd19009ddc321 ("arm: dts: k3-j721e-mcu-wakeup: Add HyperBus Controller node")
Reported-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Sinthu Raja <sinthu.raja@ti.com>
[gadiyar@ti.com: update commit description]
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Cc: Bryan Brattlof <bb@ti.com>
---

diff --git a/arch/arm/dts/k3-j721e-sk-u-boot.dtsi b/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
index 2d65e2db42..f529e7032a 100644
--- a/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
+++ b/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
@@ -33,7 +33,7 @@
 &cbass_main{
 	u-boot,dm-spl;
 
-	main_navss {
+	main_navss: bus@30000000 {
 		u-boot,dm-spl;
 	};
 };
@@ -49,7 +49,7 @@
 		u-boot,dm-spl;
 	};
 
-	mcu-navss {
+	mcu_navss: bus@28380000 {
 		u-boot,dm-spl;
 
 		ringacc@2b800000 {
@@ -237,6 +237,10 @@
 	u-boot,dm-spl;
 };
 
+&hbmc {
+	status = "disabled";
+};
+
 &ospi0 {
 	u-boot,dm-spl;