* [PATCH 1/2] ARM: dts: stm32mp13: add OP-TEE nodes
@ 2022-07-06 16:20 Patrick Delaunay
2022-07-06 16:20 ` [PATCH 2/2] ARM: dts: stm32mp13: add SCMI nodes Patrick Delaunay
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Patrick Delaunay @ 2022-07-06 16:20 UTC (permalink / raw)
To: u-boot
Cc: Gabriel FERNANDEZ, Etienne CARRIERE, Lionel DEBIEVE,
Gatien CHEVALLIER, Patrick Delaunay, Patrice Chotard, Tom Rini,
uboot-stm32
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";
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ARM: dts: stm32mp13: add SCMI nodes
2022-07-06 16:20 [PATCH 1/2] ARM: dts: stm32mp13: add OP-TEE nodes Patrick Delaunay
@ 2022-07-06 16:20 ` Patrick Delaunay
2022-07-07 6:24 ` Patrice CHOTARD
2022-07-07 6:23 ` [PATCH 1/2] ARM: dts: stm32mp13: add OP-TEE nodes Patrice CHOTARD
2022-07-13 11:12 ` Patrick Delaunay
2 siblings, 1 reply; 5+ messages in thread
From: Patrick Delaunay @ 2022-07-06 16:20 UTC (permalink / raw)
To: u-boot
Cc: Gabriel FERNANDEZ, Etienne CARRIERE, Lionel DEBIEVE,
Gatien CHEVALLIER, Patrick Delaunay, Patrice Chotard, Tom Rini,
uboot-stm32
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 {
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ARM: dts: stm32mp13: add OP-TEE nodes
2022-07-06 16:20 [PATCH 1/2] ARM: dts: stm32mp13: add OP-TEE nodes Patrick Delaunay
2022-07-06 16:20 ` [PATCH 2/2] ARM: dts: stm32mp13: add SCMI nodes Patrick Delaunay
@ 2022-07-07 6:23 ` Patrice CHOTARD
2022-07-13 11:12 ` Patrick Delaunay
2 siblings, 0 replies; 5+ messages in thread
From: Patrice CHOTARD @ 2022-07-07 6:23 UTC (permalink / raw)
To: Patrick Delaunay, u-boot
Cc: Gabriel FERNANDEZ, Etienne CARRIERE, Lionel DEBIEVE,
Gatien CHEVALLIER, Tom Rini, uboot-stm32
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ARM: dts: stm32mp13: add SCMI nodes
2022-07-06 16:20 ` [PATCH 2/2] ARM: dts: stm32mp13: add SCMI nodes Patrick Delaunay
@ 2022-07-07 6:24 ` Patrice CHOTARD
0 siblings, 0 replies; 5+ messages in thread
From: Patrice CHOTARD @ 2022-07-07 6:24 UTC (permalink / raw)
To: Patrick Delaunay, u-boot
Cc: Gabriel FERNANDEZ, Etienne CARRIERE, Lionel DEBIEVE,
Gatien CHEVALLIER, Tom Rini, uboot-stm32
Hi Patrick
On 7/6/22 18:20, Patrick Delaunay wrote:
> 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 {
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
Thanks
Patrice
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ARM: dts: stm32mp13: add OP-TEE nodes
2022-07-06 16:20 [PATCH 1/2] ARM: dts: stm32mp13: add OP-TEE nodes Patrick Delaunay
2022-07-06 16:20 ` [PATCH 2/2] ARM: dts: stm32mp13: add SCMI nodes Patrick Delaunay
2022-07-07 6:23 ` [PATCH 1/2] ARM: dts: stm32mp13: add OP-TEE nodes Patrice CHOTARD
@ 2022-07-13 11:12 ` Patrick Delaunay
2 siblings, 0 replies; 5+ messages in thread
From: Patrick Delaunay @ 2022-07-13 11:12 UTC (permalink / raw)
To: u-boot, Patrick Delaunay
Cc: Tom Rini, Gatien CHEVALLIER, uboot-stm32, Lionel DEBIEVE,
Gabriel FERNANDEZ, Etienne CARRIERE, Patrice Chotard
On Wed, 6 Jul 2022 18:20:24 +0200, Patrick Delaunay wrote:
> Add the node for OP-TEE firmware with the associated reserved memory nodes
>
>
Applied to stm32/master, thanks!
[1/2] ARM: dts: stm32mp13: add OP-TEE nodes
commit: 0b69ce6a816c39502941deb90543e23619e02896
[2/2] ARM: dts: stm32mp13: add SCMI nodes
commit: 44db098ae1d91bde3bd52097ab3a1a52f5b4ed84
Best regards,
--
Patrick Delaunay <patrick.delaunay@foss.st.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-07-13 11:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-06 16:20 [PATCH 1/2] ARM: dts: stm32mp13: add OP-TEE nodes Patrick Delaunay
2022-07-06 16:20 ` [PATCH 2/2] ARM: dts: stm32mp13: add SCMI nodes Patrick Delaunay
2022-07-07 6:24 ` Patrice CHOTARD
2022-07-07 6:23 ` [PATCH 1/2] ARM: dts: stm32mp13: add OP-TEE nodes Patrice CHOTARD
2022-07-13 11:12 ` Patrick Delaunay
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).