From 1f77f9176efeec2936763d61b6552c5c62860775 Mon Sep 17 00:00:00 2001 From: Sinthu Raja Date: Mon, 3 Apr 2023 12:03:12 -0500 Subject: [PATCH] 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: 58d61fb5a77ef ("arm: dts: k3-j721e-sk: Add initial A72 specific dts support") Fixes: 297daac43afb9 ("arm: dts: k3-j721e-mcu-wakeup: Add HyperBus Controller node") Reported-by: Anand Gadiyar Signed-off-by: Sinthu Raja [gadiyar@ti.com: update commit description] Signed-off-by: Anand Gadiyar Cc: Bryan Brattlof --- arch/arm/dts/k3-j721e-sk-u-boot.dtsi | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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; -- 2.39.5