diff options
author | Patrick Delaunay <patrick.delaunay@foss.st.com> | 2023-07-05 17:44:58 +0200 |
---|---|---|
committer | Alexandre Torgue <alexandre.torgue@foss.st.com> | 2023-07-10 16:32:49 +0200 |
commit | abb32edfc140b1c6cecc9bcc28fd0d3d0b833f91 (patch) | |
tree | 436f4dbefeef9f65825124041514ae20e74f842c | |
parent | 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 (diff) |
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: Patrick Delaunay <patrick.delaunay@foss.st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>
-rw-r--r-- | arch/arm/boot/dts/st/stm32mp15-scmi.dtsi | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/boot/dts/st/stm32mp15-scmi.dtsi b/arch/arm/boot/dts/st/stm32mp15-scmi.dtsi index 543f24c2f4f6..ad2584213d99 100644 --- a/arch/arm/boot/dts/st/stm32mp15-scmi.dtsi +++ b/arch/arm/boot/dts/st/stm32mp15-scmi.dtsi @@ -16,7 +16,6 @@ #address-cells = <1>; #size-cells = <0>; linaro,optee-channel-id = <0>; - shmem = <&scmi_shm>; scmi_clk: protocol@14 { reg = <0x14>; @@ -60,21 +59,6 @@ }; }; }; - - 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>; - }; - }; - }; }; ®11 { |