[PATCH v7 07/11] arm64: dts: ti: k3-am62a-ti-ipc-firmware: Move wkup reserved memory

[Andrew Davis]

On 7/1/26 7:39 AM, Markus Schneider-Pargmann (TI) wrote:
> Move the reserved memory regions used for wkup_r5fss0_core0 to the
> k3-am62a-ti-ipc-firmware.dtsi. These are all the same for the other
> boards as well, so we can combine them here similar to what is already
> done for the mcu_r5fss0_core0 memory regions.

The reason we left this region here in the base DTSI is this region
is for the DM firmware and is required for the SoC to function.
The other firmware regions are all optional.

Andrew

> 
> It also moves the bootph-pre-ram flags from k3-am62d2-evm.dts into the
> firmware dtsi so that all boards inherit them.
> 
> Signed-off-by: Markus Schneider-Pargmann (TI) <msp at baylibre.com>
> ---
>   arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi     | 12 ------------
>   arch/arm64/boot/dts/ti/k3-am62a-ti-ipc-firmware.dtsi | 14 ++++++++++++++
>   arch/arm64/boot/dts/ti/k3-am62a7-sk.dts              | 12 ------------
>   arch/arm64/boot/dts/ti/k3-am62d2-evm.dts             | 17 -----------------
>   4 files changed, 14 insertions(+), 41 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi b/arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi
> index e13da7c95a30459e7649f284689039b89a95f651..228ffa4be4be7b32e43a06d807d3fee073d203dc 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi
> @@ -59,18 +59,6 @@ linux,cma {
>   			linux,cma-default;
>   		};
>   
> -		wkup_r5fss0_core0_dma_memory_region: memory at 9c800000 {
> -			compatible = "shared-dma-pool";
> -			reg = <0x00 0x9c800000 0x00 0x100000>;
> -			no-map;
> -		};
> -
> -		wkup_r5fss0_core0_memory_region: memory at 9c900000 {
> -			compatible = "shared-dma-pool";
> -			reg = <0x00 0x9c900000 0x00 0x01d00000>;
> -			no-map;
> -		};
> -
>   		secure_tfa_ddr: tfa at 9e780000 {
>   			reg = <0x00 0x9e780000 0x00 0x80000>;
>   			alignment = <0x1000>;
> diff --git a/arch/arm64/boot/dts/ti/k3-am62a-ti-ipc-firmware.dtsi b/arch/arm64/boot/dts/ti/k3-am62a-ti-ipc-firmware.dtsi
> index 06d4e815b1670beafb8852b76a3f6a79295ce8ca..682b1c9f3071ddf23044c1fde1e88f2b901ec64c 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62a-ti-ipc-firmware.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am62a-ti-ipc-firmware.dtsi
> @@ -29,6 +29,19 @@ mcu_r5fss0_core0_memory_region: memory at 9b900000 {
>   		reg = <0x00 0x9b900000 0x00 0xf00000>;
>   		no-map;
>   	};
> +
> +	wkup_r5fss0_core0_dma_memory_region: memory at 9c800000 {
> +		compatible = "shared-dma-pool";
> +		reg = <0x00 0x9c800000 0x00 0x100000>;
> +		no-map;
> +	};
> +
> +	wkup_r5fss0_core0_memory_region: memory at 9c900000 {
> +		compatible = "shared-dma-pool";
> +		reg = <0x00 0x9c900000 0x00 0x01d00000>;
> +		no-map;
> +		bootph-pre-ram;
> +	};
>   };
>   
>   &mailbox0_cluster0 {
> @@ -67,6 +80,7 @@ &wkup_r5fss0_core0 {
>   	memory-region = <&wkup_r5fss0_core0_dma_memory_region>,
>   			<&wkup_r5fss0_core0_memory_region>;
>   	memory-region-names = "dma", "firmware";
> +	bootph-pre-ram;
>   	status = "okay";
>   };
>   
> diff --git a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
> index 08c73cae26c73993a613372110bfd5611c403846..27801c22a550330b52c4424f919d80f10dc76403 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
> @@ -53,18 +53,6 @@ linux,cma {
>   			linux,cma-default;
>   		};
>   
> -		wkup_r5fss0_core0_dma_memory_region: memory at 9c800000 {
> -			compatible = "shared-dma-pool";
> -			reg = <0x00 0x9c800000 0x00 0x100000>;
> -			no-map;
> -		};
> -
> -		wkup_r5fss0_core0_memory_region: memory at 9c900000 {
> -			compatible = "shared-dma-pool";
> -			reg = <0x00 0x9c900000 0x00 0x01d00000>;
> -			no-map;
> -		};
> -
>   		secure_tfa_ddr: tfa at 9e780000 {
>   			reg = <0x00 0x9e780000 0x00 0x80000>;
>   			alignment = <0x1000>;
> diff --git a/arch/arm64/boot/dts/ti/k3-am62d2-evm.dts b/arch/arm64/boot/dts/ti/k3-am62d2-evm.dts
> index 463a3f6130b8f2927a032137e87c01df446cffda..dd6937789a9c6b7c92ef5ad1fcc3ae94a90e2353 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62d2-evm.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am62d2-evm.dts
> @@ -59,19 +59,6 @@ secure_tfa_ddr: tfa at 80000000 {
>   			no-map;
>   		};
>   
> -		wkup_r5fss0_core0_dma_memory_region: memory at 9c800000 {
> -			compatible = "shared-dma-pool";
> -			reg = <0x00 0x9c800000 0x00 0x100000>;
> -			no-map;
> -		};
> -
> -		wkup_r5fss0_core0_memory_region: memory at 9c900000 {
> -			compatible = "shared-dma-pool";
> -			reg = <0x00 0x9c900000 0x00 0x01d00000>;
> -			no-map;
> -			bootph-pre-ram;
> -		};
> -
>   		secure_ddr: optee at 9e800000 {
>   			reg = <0x00 0x9e800000 0x00 0x01800000>; /* for OP-TEE */
>   			no-map;
> @@ -776,10 +763,6 @@ partition at 3fc0000 {
>   	};
>   };
>   
> -&wkup_r5fss0_core0 {
> -	bootph-pre-ram;
> -};
> -
>   &mcu_r5fss0_core0 {
>   	firmware-name = "am62d-mcu-r5f0_0-fw";
>   };
>