Add the node for SCMI firmware with the associated reserved memory nodes

Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com ---

arch/arm/dts/stm32mp13-u-boot.dtsi | 20 +++++++++++++++++++ arch/arm/dts/stm32mp131.dtsi | 31 ++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+)

diff --git a/arch/arm/dts/stm32mp13-u-boot.dtsi b/arch/arm/dts/stm32mp13-u-boot.dtsi index adc7e67ee58..01552adb7c4 100644 --- a/arch/arm/dts/stm32mp13-u-boot.dtsi +++ b/arch/arm/dts/stm32mp13-u-boot.dtsi @@ -90,6 +90,26 @@ u-boot,dm-pre-reloc; };

+&scmi { + u-boot,dm-pre-reloc; +}; + +&scmi_clk { + u-boot,dm-pre-reloc; +}; + +&scmi_reset { + u-boot,dm-pre-reloc; +}; + +&scmi_shm { + u-boot,dm-pre-reloc; +}; + +&scmi_sram { + u-boot,dm-pre-reloc; +}; + &syscfg { u-boot,dm-pre-reloc; }; diff --git a/arch/arm/dts/stm32mp131.dtsi b/arch/arm/dts/stm32mp131.dtsi index 652743fd06e..8f7af65e3ed 100644 --- a/arch/arm/dts/stm32mp131.dtsi +++ b/arch/arm/dts/stm32mp131.dtsi @@ -27,11 +27,42 @@ interrupt-parent = <&intc>; };

+ scmi_sram: sram@2ffff000 { + compatible = "mmio-sram"; + reg = <0x2ffff000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x2ffff000 0x1000>; + + scmi_shm: scmi_shm@0 { + compatible = "arm,scmi-shmem"; + reg = <0 0x80>; + }; + }; + firmware { optee: optee { method = "smc"; compatible = "linaro,optee-tz"; }; + + scmi: scmi { + compatible = "linaro,scmi-optee"; + #address-cells = <1>; + #size-cells = <0>; + linaro,optee-channel-id = <0>; + shmem = <&scmi_shm>; + + scmi_clk: protocol@14 { + reg = <0x14>; + #clock-cells = <1>; + }; + + scmi_reset: protocol@16 { + reg = <0x16>; + #reset-cells = <1>; + }; + }; };

clocks {

Hi Patrick

On 7/6/22 18:20, Patrick Delaunay wrote:

Add the node for OP-TEE firmware with the associated reserved memory nodes

Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com

arch/arm/dts/stm32mp13-u-boot.dtsi | 4 ++++ arch/arm/dts/stm32mp131.dtsi | 7 +++++++ arch/arm/dts/stm32mp135f-dk.dts | 11 +++++++++++ 3 files changed, 22 insertions(+)

diff --git a/arch/arm/dts/stm32mp13-u-boot.dtsi b/arch/arm/dts/stm32mp13-u-boot.dtsi index 1b5b3586905..adc7e67ee58 100644 --- a/arch/arm/dts/stm32mp13-u-boot.dtsi +++ b/arch/arm/dts/stm32mp13-u-boot.dtsi @@ -82,6 +82,10 @@ u-boot,dm-pre-reloc; };

+&optee {

• u-boot,dm-pre-reloc;

+};

&pinctrl { u-boot,dm-pre-reloc; }; diff --git a/arch/arm/dts/stm32mp131.dtsi b/arch/arm/dts/stm32mp131.dtsi index 950e172e455..652743fd06e 100644 --- a/arch/arm/dts/stm32mp131.dtsi +++ b/arch/arm/dts/stm32mp131.dtsi @@ -27,6 +27,13 @@ interrupt-parent = <&intc>; };

• firmware {

• optee: optee {
  

• 	method = "smc";
  

• 	compatible = "linaro,optee-tz";
  

• };
  

• };
• clocks { clk_axi: clk-axi { #clock-cells = <0>;

diff --git a/arch/arm/dts/stm32mp135f-dk.dts b/arch/arm/dts/stm32mp135f-dk.dts index ee100d108ea..31c510f976a 100644 --- a/arch/arm/dts/stm32mp135f-dk.dts +++ b/arch/arm/dts/stm32mp135f-dk.dts @@ -23,6 +23,17 @@ reg = <0xc0000000 0x20000000>; };

• reserved-memory {

• #address-cells = <1>;
  

• #size-cells = <1>;
  

• ranges;
  

• optee@de000000 {
  

• 	reg = <0xde000000 0x2000000>;
  

• 	no-map;
  

• };
  

• };
• vdd_sd: vdd-sd { compatible = "regulator-fixed"; regulator-name = "vdd_sd";

Reviewed-by: Patrice Chotard patrice.chotard@foss.st.com

Thanks Patrice