From: Tom Rini <trini@konsulko.com>
Date: Mon, 3 Apr 2023 20:45:41 +0000 (-0400)
Subject: Merge branch 'next'
X-Git-Url: http://git.dujemihanovic.xyz/%22/img/sics.gif/%22/static/git-favicon.png?a=commitdiff_plain;h=288fe30a2367b8d0e3f416493150a38ebaa88459;p=u-boot.git

Merge branch 'next'

Signed-off-by: Tom Rini <trini@konsulko.com>
---

288fe30a2367b8d0e3f416493150a38ebaa88459
diff --cc arch/arm/dts/k3-j721e-sk-u-boot.dtsi
index f529e7032a,0949caa129..31f979f3bb
--- a/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
+++ b/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
@@@ -31,10 -31,10 +31,10 @@@
  };
  
  &cbass_main{
- 	u-boot,dm-spl;
+ 	bootph-pre-ram;
  
 -	main_navss {
 +	main_navss: bus@30000000 {
- 		u-boot,dm-spl;
+ 		bootph-pre-ram;
  	};
  };
  
@@@ -46,11 -46,11 +46,11 @@@
  		reg = <0x0 0x40400000 0x0 0x80>;
  		ti,timer-alwon;
  		clock-frequency = <25000000>;
- 		u-boot,dm-spl;
+ 		bootph-pre-ram;
  	};
  
 -	mcu-navss {
 +	mcu_navss: bus@28380000 {
- 		u-boot,dm-spl;
+ 		bootph-pre-ram;
  
  		ringacc@2b800000 {
  			reg =	<0x0 0x2b800000 0x0 0x400000>,
@@@ -234,18 -234,14 +234,18 @@@
  };
  
  &fss {
- 	u-boot,dm-spl;
+ 	bootph-pre-ram;
  };
  
 +&hbmc {
 +	status = "disabled";
 +};
 +
  &ospi0 {
- 	u-boot,dm-spl;
+ 	bootph-pre-ram;
  
  	flash@0 {
- 		u-boot,dm-spl;
+ 		bootph-pre-ram;
  
  		partition@3fc0000 {
  			label = "ospi.phypattern";