[PATCH 1/2] ARM: dts: sm32mp15: remove shmem for scmi-optee

[Patrice CHOTARD]

On 7/10/23 10:44, Patrick Delaunay wrote:
> Since OP-TEE commit 89ba3422ee80 ("plat-stm32mp1: scmi_server: default
> use OP-TEE shared memory"), integrated in OP-TEE 3.22.0-rc1
> the default configuration for STM32MP15x SoCs changes,
> CFG_STM32MP1_SCMI_SHM_SYSRAM is disabled by default and the OP-TEE SMCI
> server uses ithe OP-TEE native shared memory registered by clients.
> 
> To be compatible by default with this configuration and the next OP-TEE
> version, this patch removes the SHMEM in the SCMI configuration and the
> associated reserved memory in the last 4KByte page of SRAM,
> in the STM32MP15 device tree.
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay at foss.st.com>
> ---
> 
>  arch/arm/dts/stm32mp15-scmi.dtsi | 16 ----------------
>  1 file changed, 16 deletions(-)
> 
> diff --git a/arch/arm/dts/stm32mp15-scmi.dtsi b/arch/arm/dts/stm32mp15-scmi.dtsi
> index 543f24c2f4f6..ad2584213d99 100644
> --- a/arch/arm/dts/stm32mp15-scmi.dtsi
> +++ b/arch/arm/dts/stm32mp15-scmi.dtsi
> @@ -16,7 +16,6 @@
>  			#address-cells = <1>;
>  			#size-cells = <0>;
>  			linaro,optee-channel-id = <0>;
> -			shmem = <&scmi_shm>;
>  
>  			scmi_clk: protocol at 14 {
>  				reg = <0x14>;
> @@ -60,21 +59,6 @@
>  			};
>  		};
>  	};
> -
> -	soc {
> -		scmi_sram: sram at 2ffff000 {
> -			compatible = "mmio-sram";
> -			reg = <0x2ffff000 0x1000>;
> -			#address-cells = <1>;
> -			#size-cells = <1>;
> -			ranges = <0 0x2ffff000 0x1000>;
> -
> -			scmi_shm: scmi-sram at 0 {
> -				compatible = "arm,scmi-shmem";
> -				reg = <0 0x80>;
> -			};
> -		};
> -	};
>  };
>  
>  &reg11 {

Applied on stm32-master

Thanks
Patrice