OSDN Git Service

ARM: dts: stm32: remove shmem for scmi-optee on stm32mp13
authorPatrick Delaunay <patrick.delaunay@foss.st.com>
Wed, 5 Jul 2023 15:44:59 +0000 (17:44 +0200)
committerAlexandre Torgue <alexandre.torgue@foss.st.com>
Mon, 10 Jul 2023 14:33:04 +0000 (16:33 +0200)
CFG_STM32MP1_SCMI_SHM_SYSRAM will be disabled by default for STM32MP13x
SoCs in future OP-TEE version and the OP-TEE SMCI server uses only
the OP-TEE native shared memory registered by clients.

To be compatible by default with this configuration this patch removes
the shared memory in the SCMI configuration and the associated reserved
memory in SRAM.

Fixes: 9005aeddd9fc ("ARM: dts: stm32: enable optee firmware and SCMI support on STM32MP13")
Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>
arch/arm/boot/dts/st/stm32mp131.dtsi

index d163c26..d23bbc3 100644 (file)
@@ -40,7 +40,6 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        linaro,optee-channel-id = <0>;
-                       shmem = <&scmi_shm>;
 
                        scmi_clk: protocol@14 {
                                reg = <0x14>;
                interrupt-parent = <&intc>;
                ranges;
 
-               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>;
-                       };
-               };
-
                timers2: timer@40000000 {
                        #address-cells = <1>;
                        #size-cells = <0>;