ARM: dts: stm32: don't mix SCMI and non-SCMI board compatibles

The binding erroneously decreed that the SCMI variants of the ST
evaluation kits are compatible with the non-SCMI variants.

This is not correct, as a kernel or bootloader compatible with the non-SCMI
variant is not necessarily able to function, when direct access
to resources is replaced by having to talk SCMI to the secure monitor.

The binding has been adjusted to reflect thus, so synchronize the device
trees now.

Fixes: 5b7e58313a77 ("ARM: dts: stm32: Add SCMI version of STM32 boards (DK1/DK2/ED1/EV1)")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>

diff --git a/arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts b/arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts
index 69d693ae26dd84a49841dcbabd6b97c47420aec4..ce5937270aa1df73519c42f55024f11628ca8406 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts
+++ b/arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts
@@ -11,7 +11,7 @@
 
 / {
        model = "STMicroelectronics STM32MP157A-DK1 SCMI Discovery Board";
-       compatible = "st,stm32mp157a-dk1-scmi", "st,stm32mp157a-dk1", "st,stm32mp157";
+       compatible = "st,stm32mp157a-dk1-scmi", "st,stm32mp157";
 
        reserved-memory {
                optee@de000000 {

diff --git a/arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts b/arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts
index 89bfb4143ba7b7c72971ca8f4a3f0cb2cd6982e3..c20a73841c1f67d3dc6b43941fa6cc064455f057 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts
+++ b/arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts
@@ -11,7 +11,7 @@
 
 / {
        model = "STMicroelectronics STM32MP157C-DK2 SCMI Discovery Board";
-       compatible = "st,stm32mp157c-dk2-scmi", "st,stm32mp157c-dk2", "st,stm32mp157";
+       compatible = "st,stm32mp157c-dk2-scmi", "st,stm32mp157";
 
        reserved-memory {
                optee@de000000 {

diff --git a/arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts b/arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts
index ca7a3a0f16af60cb9cb407347aec7ecb0d86c458..5e2eaf57ce22f1cfc08a688c497638c314df6373 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts
+++ b/arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts
@@ -11,7 +11,7 @@
 
 / {
        model = "STMicroelectronics STM32MP157C-ED1 SCMI eval daughter";
-       compatible = "st,stm32mp157c-ed1-scmi", "st,stm32mp157c-ed1", "st,stm32mp157";
+       compatible = "st,stm32mp157c-ed1-scmi", "st,stm32mp157";
 
        reserved-memory {
                optee@fe000000 {

diff --git a/arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts b/arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts
index f6510b93f9128456c55bceb344c8ba6116d57de1..3226fb945a8ec786686f600a7312d947b8da660f 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts
+++ b/arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts
@@ -11,8 +11,7 @@
 
 / {
        model = "STMicroelectronics STM32MP157C-EV1 SCMI eval daughter on eval mother";
-       compatible = "st,stm32mp157c-ev1-scmi", "st,stm32mp157c-ev1", "st,stm32mp157c-ed1",
-                    "st,stm32mp157";
+       compatible = "st,stm32mp157c-ev1-scmi", "st,stm32mp157c-ed1", "st,stm32mp157";
 
        reserved-memory {
                optee@fe000000 {