Commit abb32edf authored by Patrick Delaunay's avatar Patrick Delaunay Committed by Alexandre Torgue
Browse files

ARM: dts: stm32: remove shmem for scmi-optee on stm32mp15 



Since the OP-TEE commit "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 and CFG_STM32MP1_SCMI_SHM_SYSRAM is disabled
by default and the OP-TEE SMCI server uses OP-TEE native shared memory
registered by clients.

To be compatible with this configuration and the next OP-TEE versions,
this patch removes in the STM32MP15 SCMI device tree the SHMEM used by
OP-TEE SCMI and the associated reserved memory in the last 4KByte page
of SRAM.

Fixes: ea3414e1249e ("ARM: dts: stm32: move SCMI related nodes in a dedicated file for stm32mp15")
Signed-off-by: default avatarPatrick Delaunay <patrick.delaunay@foss.st.com>
Signed-off-by: default avatarAlexandre Torgue <alexandre.torgue@foss.st.com>
parent 06c2afb8

arch/arm/boot/dts/st/stm32mp15-scmi.dtsi

+0 −16
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ scmi: scmi { 
			#address-cells = <1>;

			#size-cells = <0>;

			linaro,optee-channel-id = <0>;

			shmem = <&scmi_shm>;



			scmi_clk: protocol@14 {

				reg = <0x14>;
@@ -60,21 +59,6 @@ scmi_usb33: usb33@2 { 
			};

		};

	};



	soc {

		scmi_sram: sram@2ffff000 {

			compatible = "mmio-sram";

			reg = <0x2ffff000 0x1000>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x2ffff000 0x1000>;



			scmi_shm: scmi-sram@0 {

				compatible = "arm,scmi-shmem";

				reg = <0 0x80>;

			};

		};

	};

};



&reg11 {