diff --git a/core/arch/arm/dts/stm32mp157a-dk1-scmi.dts b/core/arch/arm/dts/stm32mp157a-dk1-scmi.dts new file mode 100644 index 00000000000..5260f0e3ea6 --- /dev/null +++ b/core/arch/arm/dts/stm32mp157a-dk1-scmi.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +/* + * Copyright (C) STMicroelectronics 2023 - All Rights Reserved + */ + +/dts-v1/; + +#include "stm32mp157a-dk1.dts" + +/ { + model = "STMicroelectronics STM32MP157A-DK1 SCMI Discovery Board"; + compatible = "st,stm32mp157a-dk1-scmi", "st,stm32mp157"; +}; + +&rcc { + compatible = "st,stm32mp1-rcc-secure"; + status = "okay"; +}; diff --git a/core/arch/arm/dts/stm32mp157c-dk2-scmi.dts b/core/arch/arm/dts/stm32mp157c-dk2-scmi.dts new file mode 100644 index 00000000000..bb3e7e0e73b --- /dev/null +++ b/core/arch/arm/dts/stm32mp157c-dk2-scmi.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +/* + * Copyright (C) STMicroelectronics 2019 - All Rights Reserved + * Author: Alexandre Torgue for STMicroelectronics. + */ + +/dts-v1/; + +#include "stm32mp157c-dk2.dts" + +/ { + model = "STMicroelectronics STM32MP157C-DK2 SCMI Discovery Board"; + compatible = "st,stm32mp157c-dk2-scmi", "st,stm32mp157"; +}; + +&rcc { + compatible = "st,stm32mp1-rcc-secure"; + status = "okay"; +}; diff --git a/core/arch/arm/dts/stm32mp157c-ed1-scmi.dts b/core/arch/arm/dts/stm32mp157c-ed1-scmi.dts new file mode 100644 index 00000000000..61d96115ac8 --- /dev/null +++ b/core/arch/arm/dts/stm32mp157c-ed1-scmi.dts @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +/* + * Copyright (C) STMicroelectronics 2017 - All Rights Reserved + * Author: Ludovic Barre for STMicroelectronics. + */ +/dts-v1/; + +#include "stm32mp157c-ed1.dts" + +/ { + model = "STMicroelectronics STM32MP157C SCMI eval daughter"; + compatible = "st,stm32mp157c-ed1-scmi", "st,stm32mp157"; +}; + +&iwdg1 { + timeout-sec = <32>; +}; + +&iwdg2 { + timeout-sec = <32>; + status = "okay"; + secure-status = "disabled"; +}; + +&rcc { + compatible = "st,stm32mp1-rcc-secure"; + status = "okay"; +}; diff --git a/core/arch/arm/dts/stm32mp157c-ed1.dts b/core/arch/arm/dts/stm32mp157c-ed1.dts index cee05c4729a..944be5eb0e0 100644 --- a/core/arch/arm/dts/stm32mp157c-ed1.dts +++ b/core/arch/arm/dts/stm32mp157c-ed1.dts @@ -338,7 +338,7 @@ }; &rcc { - compatible = "st,stm32mp1-rcc-secure"; + compatible = "st,stm32mp1-rcc"; status = "okay"; }; diff --git a/core/arch/arm/dts/stm32mp157c-ev1-scmi.dts b/core/arch/arm/dts/stm32mp157c-ev1-scmi.dts new file mode 100644 index 00000000000..b4f83406fd6 --- /dev/null +++ b/core/arch/arm/dts/stm32mp157c-ev1-scmi.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +/* + * Copyright (C) STMicroelectronics 2017 - All Rights Reserved + * Author: Ludovic Barre for STMicroelectronics. + */ +/dts-v1/; + +#include "stm32mp157c-ev1.dts" + +/ { + model = "STMicroelectronics STM32MP157C SCMI eval daughter on eval mother"; + compatible = "st,stm32mp157c-ev1-scmi", "st,stm32mp157c-ed1-scmi", "st,stm32mp157"; +}; + +&rcc { + compatible = "st,stm32mp1-rcc-secure"; + status = "okay"; +}; diff --git a/core/arch/arm/dts/stm32mp15xx-dkx.dtsi b/core/arch/arm/dts/stm32mp15xx-dkx.dtsi index 7ae62e7c00c..1dd602fba45 100644 --- a/core/arch/arm/dts/stm32mp15xx-dkx.dtsi +++ b/core/arch/arm/dts/stm32mp15xx-dkx.dtsi @@ -490,7 +490,7 @@ }; &rcc { - compatible = "st,stm32mp1-rcc-secure"; + compatible = "st,stm32mp1-rcc"; status = "okay"; }; diff --git a/core/arch/arm/plat-stm32mp1/conf.mk b/core/arch/arm/plat-stm32mp1/conf.mk index 3ae03bb7d5b..ef9d708220c 100644 --- a/core/arch/arm/plat-stm32mp1/conf.mk +++ b/core/arch/arm/plat-stm32mp1/conf.mk @@ -5,17 +5,25 @@ flavor_dts_file-157C_DHCOM_PDK2 = stm32mp157c-dhcom-pdk2.dts flavor_dts_file-157C_DK2 = stm32mp157c-dk2.dts flavor_dts_file-157C_ED1 = stm32mp157c-ed1.dts flavor_dts_file-157C_EV1 = stm32mp157c-ev1.dts +flavor_dts_file-157A_DK1_SCMI = stm32mp157a-dk1-scmi.dts +flavor_dts_file-157C_DK2_SCMI = stm32mp157c-dk2-scmi.dts +flavor_dts_file-157C_ED1_SCMI = stm32mp157c-ed1-scmi.dts +flavor_dts_file-157F_EV1_SCMI = stm32mp157c-ev1-scmi.dts flavor_dts_file-135F_DK = stm32mp135f-dk.dts flavorlist-cryp-512M = $(flavor_dts_file-157C_DK2) \ + $(flavor_dts_file-157C_DK2_SCMI) \ $(flavor_dts_file-135F_DK) -flavorlist-no_cryp-512M = $(flavor_dts_file-157A_DK1) +flavorlist-no_cryp-512M = $(flavor_dts_file-157A_DK1) \ + $(flavor_dts_file-157A_DK1_SCMI) flavorlist-cryp-1G = $(flavor_dts_file-157C_DHCOM_PDK2) \ $(flavor_dts_file-157C_ED1) \ - $(flavor_dts_file-157C_EV1) + $(flavor_dts_file-157C_EV1) \ + $(flavor_dts_file-157C_ED1_SCMI) \ + $(flavor_dts_file-157C_EV1_SCMI) flavorlist-no_cryp-1G = $(flavor_dts_file-157A_DHCOR_AVENGER96) @@ -31,14 +39,22 @@ flavorlist-1G = $(flavorlist-cryp-1G) \ flavorlist-MP15-HUK-DT = $(flavor_dts_file-157A_DK1) \ $(flavor_dts_file-157C_DK2) \ $(flavor_dts_file-157C_ED1) \ - $(flavor_dts_file-157C_EV1) + $(flavor_dts_file-157C_EV1) \ + $(flavor_dts_file-157A_DK1_SCMI) \ + $(flavor_dts_file-157C_DK2_SCMI) \ + $(flavor_dts_file-157C_ED1_SCMI) \ + $(flavor_dts_file-157C_EV1_SCMI) flavorlist-MP15 = $(flavor_dts_file-157A_DHCOR_AVENGER96) \ $(flavor_dts_file-157A_DK1) \ $(flavor_dts_file-157C_DHCOM_PDK2) \ $(flavor_dts_file-157C_DK2) \ $(flavor_dts_file-157C_ED1) \ - $(flavor_dts_file-157C_EV1) + $(flavor_dts_file-157C_EV1) \ + $(flavor_dts_file-157A_DK1_SCMI) \ + $(flavor_dts_file-157C_DK2_SCMI) \ + $(flavor_dts_file-157C_ED1_SCMI) \ + $(flavor_dts_file-157C_EV1_SCMI) flavorlist-MP13 = $(flavor_dts_file-135F_DK)