From: Alexandre TORGUE <alexandre.torgue@foss.st.com>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: <kernel@pengutronix.de>, <devicetree@vger.kernel.org>,
<linux-stm32@st-md-mailman.stormreply.com>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/2] ARM: dts: stm32: don't mix SCMI and non-SCMI board compatibles
Date: Thu, 14 Dec 2023 16:37:31 +0100 [thread overview]
Message-ID: <8adec7b4-bdd9-4ad0-a302-326ed99ea732@foss.st.com> (raw)
In-Reply-To: <20231122185235.2017642-2-a.fatoum@pengutronix.de>
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 {
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-12-14 15:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-22 18:52 [PATCH 1/2] dt-bindings: arm: stm32: don't mix SCMI and non-SCMI board compatibles Ahmad Fatoum
2023-11-22 18:52 ` [PATCH 2/2] ARM: dts: " Ahmad Fatoum
2023-12-14 15:37 ` Alexandre TORGUE [this message]
2023-11-27 20:36 ` [PATCH 1/2] dt-bindings: arm: " Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8adec7b4-bdd9-4ad0-a302-326ed99ea732@foss.st.com \
--to=alexandre.torgue@foss.st.com \
--cc=a.fatoum@pengutronix.de \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=kernel@pengutronix.de \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).