From 63587b060cf6c1b2191902da89807e0ee668f375 Mon Sep 17 00:00:00 2001 From: Neha Malcom Francis Date: Wed, 14 Feb 2024 16:27:49 +0530 Subject: arm: dts: k3-*: Add memory node at R5 stage Add the bootph-pre-ram property to the memory node so that it can be accessed by FDT functions at R5 stage. The fdt_setup_mem*() functions require the memory node to be able to initialize and set the size of the DRAM banks. For this purpose, make sure all memory nodes are present and standardized, and add them if not. Also make sure they have bootph-pre-ram property so that it can be accessible at R5 SPL stage. Signed-off-by: Neha Malcom Francis --- arch/arm/dts/k3-am654-base-board.dts | 1 + arch/arm/dts/k3-am654-r5-base-board.dts | 8 ++++++++ arch/arm/dts/k3-am68-sk-som.dtsi | 5 +++-- arch/arm/dts/k3-am69-r5-sk.dts | 5 +++-- arch/arm/dts/k3-am69-sk.dts | 5 +++-- arch/arm/dts/k3-j7200-som-p0.dtsi | 5 +++-- arch/arm/dts/k3-j721e-r5-sk.dts | 1 + arch/arm/dts/k3-j721e-sk.dts | 1 + arch/arm/dts/k3-j721e-som-p0.dtsi | 1 + arch/arm/dts/k3-j721s2-som-p0.dtsi | 5 +++-- arch/arm/dts/k3-j784s4-evm.dts | 5 +++-- 11 files changed, 30 insertions(+), 12 deletions(-) (limited to 'arch') diff --git a/arch/arm/dts/k3-am654-base-board.dts b/arch/arm/dts/k3-am654-base-board.dts index 7bc8b0d5b6..999b65e7be 100644 --- a/arch/arm/dts/k3-am654-base-board.dts +++ b/arch/arm/dts/k3-am654-base-board.dts @@ -23,6 +23,7 @@ /* 4G RAM */ reg = <0x00000000 0x80000000 0x00000000 0x80000000>, <0x00000008 0x80000000 0x00000000 0x80000000>; + bootph-pre-ram; }; reserved-memory { diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts index 7671875a55..671b30b219 100644 --- a/arch/arm/dts/k3-am654-r5-base-board.dts +++ b/arch/arm/dts/k3-am654-r5-base-board.dts @@ -24,6 +24,14 @@ tick-timer = &timer1; }; + memory@80000000 { + device_type = "memory"; + /* 4G RAM */ + reg = <0x00000000 0x80000000 0x00000000 0x80000000>, + <0x00000008 0x80000000 0x00000000 0x80000000>; + bootph-pre-ram; + }; + aliases { remoteproc0 = &sysctrler; remoteproc1 = &a53_0; diff --git a/arch/arm/dts/k3-am68-sk-som.dtsi b/arch/arm/dts/k3-am68-sk-som.dtsi index a3036f9c69..e7b45694fa 100644 --- a/arch/arm/dts/k3-am68-sk-som.dtsi +++ b/arch/arm/dts/k3-am68-sk-som.dtsi @@ -12,8 +12,9 @@ memory@80000000 { device_type = "memory"; /* 16 GB RAM */ - reg = <0x00 0x80000000 0x00 0x80000000>, - <0x08 0x80000000 0x03 0x80000000>; + reg = <0x00000000 0x80000000 0x00000000 0x80000000>, + <0x00000008 0x80000000 0x00000003 0x80000000>; + bootph-pre-ram; }; /* Reserving memory regions still pending */ diff --git a/arch/arm/dts/k3-am69-r5-sk.dts b/arch/arm/dts/k3-am69-r5-sk.dts index b9e8036f20..166ab203e4 100644 --- a/arch/arm/dts/k3-am69-r5-sk.dts +++ b/arch/arm/dts/k3-am69-r5-sk.dts @@ -30,8 +30,9 @@ memory@80000000 { device_type = "memory"; /* 32G RAM */ - reg = <0x00 0x80000000 0x00 0x80000000>, - <0x08 0x80000000 0x07 0x80000000>; + reg = <0x00000000 0x80000000 0x00000000 0x80000000>, + <0x00000008 0x80000000 0x00000007 0x80000000>; + bootph-pre-ram; }; a72_0: a72@0 { diff --git a/arch/arm/dts/k3-am69-sk.dts b/arch/arm/dts/k3-am69-sk.dts index 212e746e08..508fbee411 100644 --- a/arch/arm/dts/k3-am69-sk.dts +++ b/arch/arm/dts/k3-am69-sk.dts @@ -31,8 +31,9 @@ memory@80000000 { device_type = "memory"; /* 32G RAM */ - reg = <0x00 0x80000000 0x00 0x80000000>, - <0x08 0x80000000 0x07 0x80000000>; + reg = <0x00000000 0x80000000 0x00000000 0x80000000>, + <0x00000008 0x80000000 0x00000007 0x80000000>; + bootph-pre-ram; }; reserved_memory: reserved-memory { diff --git a/arch/arm/dts/k3-j7200-som-p0.dtsi b/arch/arm/dts/k3-j7200-som-p0.dtsi index 73a7d5266c..91e78d99a4 100644 --- a/arch/arm/dts/k3-j7200-som-p0.dtsi +++ b/arch/arm/dts/k3-j7200-som-p0.dtsi @@ -11,8 +11,9 @@ memory@80000000 { device_type = "memory"; /* 4G RAM */ - reg = <0x00 0x80000000 0x00 0x80000000>, - <0x08 0x80000000 0x00 0x80000000>; + reg = <0x00000000 0x80000000 0x00000000 0x80000000>, + <0x00000008 0x80000000 0x00000000 0x80000000>; + bootph-pre-ram; }; reserved_memory: reserved-memory { diff --git a/arch/arm/dts/k3-j721e-r5-sk.dts b/arch/arm/dts/k3-j721e-r5-sk.dts index 89344a4b24..74cb1b13e0 100644 --- a/arch/arm/dts/k3-j721e-r5-sk.dts +++ b/arch/arm/dts/k3-j721e-r5-sk.dts @@ -27,6 +27,7 @@ /* 4G RAM */ reg = <0x00000000 0x80000000 0x00000000 0x80000000>, <0x00000008 0x80000000 0x00000000 0x80000000>; + bootph-pre-ram; }; reserved_memory: reserved-memory { diff --git a/arch/arm/dts/k3-j721e-sk.dts b/arch/arm/dts/k3-j721e-sk.dts index 847ff73431..34b762cd0e 100644 --- a/arch/arm/dts/k3-j721e-sk.dts +++ b/arch/arm/dts/k3-j721e-sk.dts @@ -24,6 +24,7 @@ /* 4G RAM */ reg = <0x00000000 0x80000000 0x00000000 0x80000000>, <0x00000008 0x80000000 0x00000000 0x80000000>; + bootph-pre-ram; }; reserved_memory: reserved-memory { diff --git a/arch/arm/dts/k3-j721e-som-p0.dtsi b/arch/arm/dts/k3-j721e-som-p0.dtsi index 45e0f322f9..e0950fb3a5 100644 --- a/arch/arm/dts/k3-j721e-som-p0.dtsi +++ b/arch/arm/dts/k3-j721e-som-p0.dtsi @@ -13,6 +13,7 @@ /* 4G RAM */ reg = <0x00000000 0x80000000 0x00000000 0x80000000>, <0x00000008 0x80000000 0x00000000 0x80000000>; + bootph-pre-ram; }; reserved_memory: reserved-memory { diff --git a/arch/arm/dts/k3-j721s2-som-p0.dtsi b/arch/arm/dts/k3-j721s2-som-p0.dtsi index 11d620a78c..570c0442ba 100644 --- a/arch/arm/dts/k3-j721s2-som-p0.dtsi +++ b/arch/arm/dts/k3-j721s2-som-p0.dtsi @@ -12,8 +12,9 @@ memory@80000000 { device_type = "memory"; /* 16 GB RAM */ - reg = <0x00 0x80000000 0x00 0x80000000>, - <0x08 0x80000000 0x03 0x80000000>; + reg = <0x00000000 0x80000000 0x00000000 0x80000000>, + <0x00000008 0x80000000 0x00000003 0x80000000>; + bootph-pre-ram; }; reserved_memory: reserved-memory { diff --git a/arch/arm/dts/k3-j784s4-evm.dts b/arch/arm/dts/k3-j784s4-evm.dts index 19e4bf72c9..e936a82002 100644 --- a/arch/arm/dts/k3-j784s4-evm.dts +++ b/arch/arm/dts/k3-j784s4-evm.dts @@ -29,8 +29,9 @@ memory@80000000 { device_type = "memory"; /* 32G RAM */ - reg = <0x00 0x80000000 0x00 0x80000000>, - <0x08 0x80000000 0x07 0x80000000>; + reg = <0x00000000 0x80000000 0x00000000 0x80000000>, + <0x00000008 0x80000000 0x00000007 0x80000000>; + bootph-pre-ram; }; reserved_memory: reserved-memory { -- cgit v1.2.3