| Message ID | 20231122185235.2017642-2-a.fatoum@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] dt-bindings: arm: stm32: don't mix SCMI and non-SCMI board compatibles | expand |
Hi Ahmad On 11/22/23 19:52, Ahmad Fatoum wrote: > 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> > --- Thanks to have fix my error. Both patches applied on stm32-next. Cheers Alex > arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts | 2 +- > arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts | 2 +- > arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts | 2 +- > arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts | 3 +-- > 4 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts b/arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts > index afcd6285890c..c27963898b5e 100644 > --- 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 39358d902000..622618943134 100644 > --- 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 07ea765a4553..c7c4d7e89d61 100644 > --- 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 813086ec2489..2ab77e64f1bb 100644 > --- 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 {
diff --git a/arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts b/arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts index afcd6285890c..c27963898b5e 100644 --- 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 39358d902000..622618943134 100644 --- 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 07ea765a4553..c7c4d7e89d61 100644 --- 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 813086ec2489..2ab77e64f1bb 100644 --- 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 {
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> --- arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts | 2 +- arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts | 2 +- arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts | 2 +- arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-)