2022-07-13 13:51:48

by Pali Rohár

Subject: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

All Armada 3720 boards have Armada 3720 processor which is of Armada 3700
family and do not have Armada 3710 processor. So none of them should have
compatible string for Armada 3710 processor.

Fix compatible string for all these boards by removing wrong processor
string "marvell,armada3710" and adding family string "marvell,armada3700"
as the last one. (Note that this is same way how are defined Armada 3710
DTS files).

Signed-off-by: Pali Rohár <[email protected]>
---
arch/arm64/boot/dts/marvell/armada-3720-db.dts | 2 +-
arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts | 2 +-
arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts | 2 +-
arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts | 2 +-
arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts | 2 +-
arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | 2 +-
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +-
arch/arm64/boot/dts/marvell/armada-372x.dtsi | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
index bd4e61d5448e..0cfb38492021 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
@@ -18,7 +18,7 @@

/ {
model = "Marvell Armada 3720 Development Board DB-88F3720-DDR3";
- compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3710";
+ compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3700";

chosen {
stdout-path = "serial0:115200n8";
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
index 5c4d8f379704..6715a19c1483 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
@@ -18,7 +18,7 @@
/ {
model = "Globalscale Marvell ESPRESSOBin Board (eMMC)";
compatible = "globalscale,espressobin-emmc", "globalscale,espressobin",
- "marvell,armada3720", "marvell,armada3710";
+ "marvell,armada3720", "marvell,armada3700";
};

&sdhci0 {
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
index 070725b81be5..447760b69850 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
@@ -13,7 +13,7 @@
/ {
model = "Globalscale Marvell ESPRESSOBin Ultra Board";
compatible = "globalscale,espressobin-ultra", "marvell,armada3720",
- "marvell,armada3710";
+ "marvell,armada3700";

aliases {
/* ethernet1 is WAN port */
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
index 75401eab4d42..2a8aa3901a9f 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
@@ -19,7 +19,7 @@
model = "Globalscale Marvell ESPRESSOBin Board V7 (eMMC)";
compatible = "globalscale,espressobin-v7-emmc", "globalscale,espressobin-v7",
"globalscale,espressobin", "marvell,armada3720",
- "marvell,armada3710";
+ "marvell,armada3700";

aliases {
/* ethernet1 is wan port */
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
index 48a7f50fb427..b03af87611a9 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
@@ -18,7 +18,7 @@
/ {
model = "Globalscale Marvell ESPRESSOBin Board V7";
compatible = "globalscale,espressobin-v7", "globalscale,espressobin",
- "marvell,armada3720", "marvell,armada3710";
+ "marvell,armada3720", "marvell,armada3700";

aliases {
/* ethernet1 is wan port */
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
index 1542d836c090..c5a834b33b77 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
@@ -16,5 +16,5 @@

/ {
model = "Globalscale Marvell ESPRESSOBin Board";
- compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
+ compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
};
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
index caf9c8529fca..5840ed129309 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
@@ -14,7 +14,7 @@
/ {
model = "CZ.NIC Turris Mox Board";
compatible = "cznic,turris-mox", "marvell,armada3720",
- "marvell,armada3710";
+ "marvell,armada3700";

aliases {
spi0 = &spi0;
diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
index 5ce55bdbb995..02ae1e153288 100644
--- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
@@ -13,7 +13,7 @@

/ {
model = "Marvell Armada 3720 SoC";
- compatible = "marvell,armada3720", "marvell,armada3710";
+ compatible = "marvell,armada3720", "marvell,armada3700";

cpus {
cpu1: cpu@1 {
--
2.20.1

2022-07-13 20:11:14

by Pali Rohár

Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

On Wednesday 13 July 2022 21:42:43 Krzysztof Kozlowski wrote:
> On 13/07/2022 14:56, Pali Rohár wrote:
> > All Armada 3720 boards have Armada 3720 processor which is of Armada 3700
> > family and do not have Armada 3710 processor. So none of them should have
> > compatible string for Armada 3710 processor.
> >
> > Fix compatible string for all these boards by removing wrong processor
> > string "marvell,armada3710" and adding family string "marvell,armada3700"
> > as the last one. (Note that this is same way how are defined Armada 3710
> > DTS files).
>
> Please do not introduce some changes just in DTS, but start from the
> bindings. Someone wrote the bindings like that and expected to be that
> way, so first change the bindings with proper rationale. Then change the
> DTS files.
>
>
> Best regards,
> Krzysztof

Ok, I tried to update bindings and fix example in it, see patch:
https://lore.kernel.org/linux-devicetree/[email protected]/

2022-07-13 21:02:49

by Krzysztof Kozlowski

Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

On 13/07/2022 14:56, Pali Rohár wrote:
> All Armada 3720 boards have Armada 3720 processor which is of Armada 3700
> family and do not have Armada 3710 processor. So none of them should have
> compatible string for Armada 3710 processor.
>
> Fix compatible string for all these boards by removing wrong processor
> string "marvell,armada3710" and adding family string "marvell,armada3700"
> as the last one. (Note that this is same way how are defined Armada 3710
> DTS files).

Please do not introduce some changes just in DTS, but start from the
bindings. Someone wrote the bindings like that and expected to be that
way, so first change the bindings with proper rationale. Then change the
DTS files.


Best regards,
Krzysztof

2022-07-14 07:04:21

by Krzysztof Kozlowski

Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

On 13/07/2022 22:03, Pali Rohár wrote:
> On Wednesday 13 July 2022 21:42:43 Krzysztof Kozlowski wrote:
>> On 13/07/2022 14:56, Pali Rohár wrote:
>>> All Armada 3720 boards have Armada 3720 processor which is of Armada 3700
>>> family and do not have Armada 3710 processor. So none of them should have
>>> compatible string for Armada 3710 processor.
>>>
>>> Fix compatible string for all these boards by removing wrong processor
>>> string "marvell,armada3710" and adding family string "marvell,armada3700"
>>> as the last one. (Note that this is same way how are defined Armada 3710
>>> DTS files).
>>
>> Please do not introduce some changes just in DTS, but start from the
>> bindings. Someone wrote the bindings like that and expected to be that
>> way, so first change the bindings with proper rationale. Then change the
>> DTS files.
>>
>>
>> Best regards,
>> Krzysztof
>
> Ok, I tried to update bindings and fix example in it, see patch:
> https://lore.kernel.org/linux-devicetree/[email protected]/

The reason you used here should be expressed in that commit as well
because you change the ABI and affect other users (projects, systems).

Best regards,
Krzysztof

2022-07-14 09:38:06

by Pali Rohár

Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

On Thursday 14 July 2022 08:56:12 Krzysztof Kozlowski wrote:
> On 13/07/2022 22:03, Pali Rohár wrote:
> > On Wednesday 13 July 2022 21:42:43 Krzysztof Kozlowski wrote:
> >> On 13/07/2022 14:56, Pali Rohár wrote:
> >>> All Armada 3720 boards have Armada 3720 processor which is of Armada 3700
> >>> family and do not have Armada 3710 processor. So none of them should have
> >>> compatible string for Armada 3710 processor.
> >>>
> >>> Fix compatible string for all these boards by removing wrong processor
> >>> string "marvell,armada3710" and adding family string "marvell,armada3700"
> >>> as the last one. (Note that this is same way how are defined Armada 3710
> >>> DTS files).
> >>
> >> Please do not introduce some changes just in DTS, but start from the
> >> bindings. Someone wrote the bindings like that and expected to be that
> >> way, so first change the bindings with proper rationale. Then change the
> >> DTS files.
> >>
> >>
> >> Best regards,
> >> Krzysztof
> >
> > Ok, I tried to update bindings and fix example in it, see patch:
> > https://lore.kernel.org/linux-devicetree/[email protected]/
>
> The reason you used here should be expressed in that commit as well

Which I exactly did (Armada 3700 = famity, Armada 3720 = SoC, Armada
3720 DB is name of the board with Armada 3720 SoC, so correctly indicate
SoC in example). So what else?

> because you change the ABI and affect other users (projects, systems).
>
> Best regards,
> Krzysztof

2022-08-08 20:34:54

by Pali Rohár

Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

PING?

On Wednesday 13 July 2022 14:56:44 Pali Rohár wrote:
> All Armada 3720 boards have Armada 3720 processor which is of Armada 3700
> family and do not have Armada 3710 processor. So none of them should have
> compatible string for Armada 3710 processor.
>
> Fix compatible string for all these boards by removing wrong processor
> string "marvell,armada3710" and adding family string "marvell,armada3700"
> as the last one. (Note that this is same way how are defined Armada 3710
> DTS files).
>
> Signed-off-by: Pali Rohár <[email protected]>
> ---
> arch/arm64/boot/dts/marvell/armada-3720-db.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-372x.dtsi | 2 +-
> 8 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> index bd4e61d5448e..0cfb38492021 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> @@ -18,7 +18,7 @@
>
> / {
> model = "Marvell Armada 3720 Development Board DB-88F3720-DDR3";
> - compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3710";
> + compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3700";
>
> chosen {
> stdout-path = "serial0:115200n8";
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> index 5c4d8f379704..6715a19c1483 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> @@ -18,7 +18,7 @@
> / {
> model = "Globalscale Marvell ESPRESSOBin Board (eMMC)";
> compatible = "globalscale,espressobin-emmc", "globalscale,espressobin",
> - "marvell,armada3720", "marvell,armada3710";
> + "marvell,armada3720", "marvell,armada3700";
> };
>
> &sdhci0 {
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> index 070725b81be5..447760b69850 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> @@ -13,7 +13,7 @@
> / {
> model = "Globalscale Marvell ESPRESSOBin Ultra Board";
> compatible = "globalscale,espressobin-ultra", "marvell,armada3720",
> - "marvell,armada3710";
> + "marvell,armada3700";
>
> aliases {
> /* ethernet1 is WAN port */
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> index 75401eab4d42..2a8aa3901a9f 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> @@ -19,7 +19,7 @@
> model = "Globalscale Marvell ESPRESSOBin Board V7 (eMMC)";
> compatible = "globalscale,espressobin-v7-emmc", "globalscale,espressobin-v7",
> "globalscale,espressobin", "marvell,armada3720",
> - "marvell,armada3710";
> + "marvell,armada3700";
>
> aliases {
> /* ethernet1 is wan port */
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> index 48a7f50fb427..b03af87611a9 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> @@ -18,7 +18,7 @@
> / {
> model = "Globalscale Marvell ESPRESSOBin Board V7";
> compatible = "globalscale,espressobin-v7", "globalscale,espressobin",
> - "marvell,armada3720", "marvell,armada3710";
> + "marvell,armada3720", "marvell,armada3700";
>
> aliases {
> /* ethernet1 is wan port */
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> index 1542d836c090..c5a834b33b77 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> @@ -16,5 +16,5 @@
>
> / {
> model = "Globalscale Marvell ESPRESSOBin Board";
> - compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
> + compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
> };
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> index caf9c8529fca..5840ed129309 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> @@ -14,7 +14,7 @@
> / {
> model = "CZ.NIC Turris Mox Board";
> compatible = "cznic,turris-mox", "marvell,armada3720",
> - "marvell,armada3710";
> + "marvell,armada3700";
>
> aliases {
> spi0 = &spi0;
> diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> index 5ce55bdbb995..02ae1e153288 100644
> --- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> @@ -13,7 +13,7 @@
>
> / {
> model = "Marvell Armada 3720 SoC";
> - compatible = "marvell,armada3720", "marvell,armada3710";
> + compatible = "marvell,armada3720", "marvell,armada3700";
>
> cpus {
> cpu1: cpu@1 {
> --
> 2.20.1
>

2022-08-08 20:48:45

by Pali Rohár

Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

On Monday 08 August 2022 22:33:30 Andrew Lunn wrote:
> On Mon, Aug 08, 2022 at 10:24:56PM +0200, Pali Rohár wrote:
> > PING?
>
> It is too late for the merge window.
>
> > > diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > index 5ce55bdbb995..02ae1e153288 100644
> > > --- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > +++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > @@ -13,7 +13,7 @@
> > >
> > > / {
> > > model = "Marvell Armada 3720 SoC";
> > > - compatible = "marvell,armada3720", "marvell,armada3710";
> > > + compatible = "marvell,armada3720", "marvell,armada3700";
>
> Does it make sense to have a compatible here? The board .dts should
> provide it. And if the board does not provide it, we probably want the
> board to not boot because it does not have a compatible.
>
> Andrew

Sounds like there should not be a compatible string and model string.

I can prepare a followup patch to remove those strings from SoC dtsi file.

2022-08-08 20:59:21

by Andrew Lunn

Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

On Mon, Aug 08, 2022 at 10:24:56PM +0200, Pali Roh?r wrote:
> PING?

It is too late for the merge window.

> > diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > index 5ce55bdbb995..02ae1e153288 100644
> > --- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > +++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > @@ -13,7 +13,7 @@
> >
> > / {
> > model = "Marvell Armada 3720 SoC";
> > - compatible = "marvell,armada3720", "marvell,armada3710";
> > + compatible = "marvell,armada3720", "marvell,armada3700";

Does it make sense to have a compatible here? The board .dts should
provide it. And if the board does not provide it, we probably want the
board to not boot because it does not have a compatible.

Andrew

2022-09-02 23:06:10

by Pali Rohár

Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

On Monday 08 August 2022 22:33:30 Andrew Lunn wrote:
> On Mon, Aug 08, 2022 at 10:24:56PM +0200, Pali Rohár wrote:
> > PING?
>
> It is too late for the merge window.

So, now for the next?

> > > diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > index 5ce55bdbb995..02ae1e153288 100644
> > > --- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > +++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > @@ -13,7 +13,7 @@
> > >
> > > / {
> > > model = "Marvell Armada 3720 SoC";
> > > - compatible = "marvell,armada3720", "marvell,armada3710";
> > > + compatible = "marvell,armada3720", "marvell,armada3700";
>
> Does it make sense to have a compatible here? The board .dts should
> provide it. And if the board does not provide it, we probably want the
> board to not boot because it does not have a compatible.
>
> Andrew

2022-09-19 23:43:57

by Pali Rohár

Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

On Saturday 03 September 2022 00:31:10 Pali Rohár wrote:
> On Monday 08 August 2022 22:33:30 Andrew Lunn wrote:
> > On Mon, Aug 08, 2022 at 10:24:56PM +0200, Pali Rohár wrote:
> > > PING?
> >
> > It is too late for the merge window.
>
> So, now for the next?

PING?

> > > > diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > > index 5ce55bdbb995..02ae1e153288 100644
> > > > --- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > > +++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > > @@ -13,7 +13,7 @@
> > > >
> > > > / {
> > > > model = "Marvell Armada 3720 SoC";
> > > > - compatible = "marvell,armada3720", "marvell,armada3710";
> > > > + compatible = "marvell,armada3720", "marvell,armada3700";
> >
> > Does it make sense to have a compatible here? The board .dts should
> > provide it. And if the board does not provide it, we probably want the
> > board to not boot because it does not have a compatible.
> >
> > Andrew

2022-09-30 23:45:05

by Pali Rohár

Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

Gregory: ping

On Wednesday 13 July 2022 14:56:44 Pali Rohár wrote:
> All Armada 3720 boards have Armada 3720 processor which is of Armada 3700
> family and do not have Armada 3710 processor. So none of them should have
> compatible string for Armada 3710 processor.
>
> Fix compatible string for all these boards by removing wrong processor
> string "marvell,armada3710" and adding family string "marvell,armada3700"
> as the last one. (Note that this is same way how are defined Armada 3710
> DTS files).
>
> Signed-off-by: Pali Rohár <[email protected]>
> ---
> arch/arm64/boot/dts/marvell/armada-3720-db.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-372x.dtsi | 2 +-
> 8 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> index bd4e61d5448e..0cfb38492021 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> @@ -18,7 +18,7 @@
>
> / {
> model = "Marvell Armada 3720 Development Board DB-88F3720-DDR3";
> - compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3710";
> + compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3700";
>
> chosen {
> stdout-path = "serial0:115200n8";
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> index 5c4d8f379704..6715a19c1483 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> @@ -18,7 +18,7 @@
> / {
> model = "Globalscale Marvell ESPRESSOBin Board (eMMC)";
> compatible = "globalscale,espressobin-emmc", "globalscale,espressobin",
> - "marvell,armada3720", "marvell,armada3710";
> + "marvell,armada3720", "marvell,armada3700";
> };
>
> &sdhci0 {
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> index 070725b81be5..447760b69850 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> @@ -13,7 +13,7 @@
> / {
> model = "Globalscale Marvell ESPRESSOBin Ultra Board";
> compatible = "globalscale,espressobin-ultra", "marvell,armada3720",
> - "marvell,armada3710";
> + "marvell,armada3700";
>
> aliases {
> /* ethernet1 is WAN port */
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> index 75401eab4d42..2a8aa3901a9f 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> @@ -19,7 +19,7 @@
> model = "Globalscale Marvell ESPRESSOBin Board V7 (eMMC)";
> compatible = "globalscale,espressobin-v7-emmc", "globalscale,espressobin-v7",
> "globalscale,espressobin", "marvell,armada3720",
> - "marvell,armada3710";
> + "marvell,armada3700";
>
> aliases {
> /* ethernet1 is wan port */
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> index 48a7f50fb427..b03af87611a9 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> @@ -18,7 +18,7 @@
> / {
> model = "Globalscale Marvell ESPRESSOBin Board V7";
> compatible = "globalscale,espressobin-v7", "globalscale,espressobin",
> - "marvell,armada3720", "marvell,armada3710";
> + "marvell,armada3720", "marvell,armada3700";
>
> aliases {
> /* ethernet1 is wan port */
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> index 1542d836c090..c5a834b33b77 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> @@ -16,5 +16,5 @@
>
> / {
> model = "Globalscale Marvell ESPRESSOBin Board";
> - compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
> + compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
> };
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> index caf9c8529fca..5840ed129309 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> @@ -14,7 +14,7 @@
> / {
> model = "CZ.NIC Turris Mox Board";
> compatible = "cznic,turris-mox", "marvell,armada3720",
> - "marvell,armada3710";
> + "marvell,armada3700";
>
> aliases {
> spi0 = &spi0;
> diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> index 5ce55bdbb995..02ae1e153288 100644
> --- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> @@ -13,7 +13,7 @@
>
> / {
> model = "Marvell Armada 3720 SoC";
> - compatible = "marvell,armada3720", "marvell,armada3710";
> + compatible = "marvell,armada3720", "marvell,armada3700";
>
> cpus {
> cpu1: cpu@1 {
> --
> 2.20.1
>

2022-10-09 12:28:09

by Pali Rohár

Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

PING

On Saturday 01 October 2022 01:38:02 Pali Rohár wrote:
> Gregory: ping
>
> On Wednesday 13 July 2022 14:56:44 Pali Rohár wrote:
> > All Armada 3720 boards have Armada 3720 processor which is of Armada 3700
> > family and do not have Armada 3710 processor. So none of them should have
> > compatible string for Armada 3710 processor.
> >
> > Fix compatible string for all these boards by removing wrong processor
> > string "marvell,armada3710" and adding family string "marvell,armada3700"
> > as the last one. (Note that this is same way how are defined Armada 3710
> > DTS files).
> >
> > Signed-off-by: Pali Rohár <[email protected]>
> > ---
> > arch/arm64/boot/dts/marvell/armada-3720-db.dts | 2 +-
> > arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts | 2 +-
> > arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts | 2 +-
> > arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts | 2 +-
> > arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts | 2 +-
> > arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | 2 +-
> > arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +-
> > arch/arm64/boot/dts/marvell/armada-372x.dtsi | 2 +-
> > 8 files changed, 8 insertions(+), 8 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> > index bd4e61d5448e..0cfb38492021 100644
> > --- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> > +++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> > @@ -18,7 +18,7 @@
> >
> > / {
> > model = "Marvell Armada 3720 Development Board DB-88F3720-DDR3";
> > - compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3710";
> > + compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3700";
> >
> > chosen {
> > stdout-path = "serial0:115200n8";
> > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> > index 5c4d8f379704..6715a19c1483 100644
> > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> > @@ -18,7 +18,7 @@
> > / {
> > model = "Globalscale Marvell ESPRESSOBin Board (eMMC)";
> > compatible = "globalscale,espressobin-emmc", "globalscale,espressobin",
> > - "marvell,armada3720", "marvell,armada3710";
> > + "marvell,armada3720", "marvell,armada3700";
> > };
> >
> > &sdhci0 {
> > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> > index 070725b81be5..447760b69850 100644
> > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> > @@ -13,7 +13,7 @@
> > / {
> > model = "Globalscale Marvell ESPRESSOBin Ultra Board";
> > compatible = "globalscale,espressobin-ultra", "marvell,armada3720",
> > - "marvell,armada3710";
> > + "marvell,armada3700";
> >
> > aliases {
> > /* ethernet1 is WAN port */
> > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> > index 75401eab4d42..2a8aa3901a9f 100644
> > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> > @@ -19,7 +19,7 @@
> > model = "Globalscale Marvell ESPRESSOBin Board V7 (eMMC)";
> > compatible = "globalscale,espressobin-v7-emmc", "globalscale,espressobin-v7",
> > "globalscale,espressobin", "marvell,armada3720",
> > - "marvell,armada3710";
> > + "marvell,armada3700";
> >
> > aliases {
> > /* ethernet1 is wan port */
> > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> > index 48a7f50fb427..b03af87611a9 100644
> > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> > @@ -18,7 +18,7 @@
> > / {
> > model = "Globalscale Marvell ESPRESSOBin Board V7";
> > compatible = "globalscale,espressobin-v7", "globalscale,espressobin",
> > - "marvell,armada3720", "marvell,armada3710";
> > + "marvell,armada3720", "marvell,armada3700";
> >
> > aliases {
> > /* ethernet1 is wan port */
> > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> > index 1542d836c090..c5a834b33b77 100644
> > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> > @@ -16,5 +16,5 @@
> >
> > / {
> > model = "Globalscale Marvell ESPRESSOBin Board";
> > - compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
> > + compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
> > };
> > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> > index caf9c8529fca..5840ed129309 100644
> > --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> > +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> > @@ -14,7 +14,7 @@
> > / {
> > model = "CZ.NIC Turris Mox Board";
> > compatible = "cznic,turris-mox", "marvell,armada3720",
> > - "marvell,armada3710";
> > + "marvell,armada3700";
> >
> > aliases {
> > spi0 = &spi0;
> > diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > index 5ce55bdbb995..02ae1e153288 100644
> > --- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > +++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > @@ -13,7 +13,7 @@
> >
> > / {
> > model = "Marvell Armada 3720 SoC";
> > - compatible = "marvell,armada3720", "marvell,armada3710";
> > + compatible = "marvell,armada3720", "marvell,armada3700";
> >
> > cpus {
> > cpu1: cpu@1 {
> > --
> > 2.20.1
> >

2022-11-01 23:05:11

by Pali Rohár

Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

PING?

On Sunday 09 October 2022 14:06:39 Pali Rohár wrote:
> PING
>
> On Saturday 01 October 2022 01:38:02 Pali Rohár wrote:
> > Gregory: ping
> >
> > On Wednesday 13 July 2022 14:56:44 Pali Rohár wrote:
> > > All Armada 3720 boards have Armada 3720 processor which is of Armada 3700
> > > family and do not have Armada 3710 processor. So none of them should have
> > > compatible string for Armada 3710 processor.
> > >
> > > Fix compatible string for all these boards by removing wrong processor
> > > string "marvell,armada3710" and adding family string "marvell,armada3700"
> > > as the last one. (Note that this is same way how are defined Armada 3710
> > > DTS files).
> > >
> > > Signed-off-by: Pali Rohár <[email protected]>
> > > ---
> > > arch/arm64/boot/dts/marvell/armada-3720-db.dts | 2 +-
> > > arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts | 2 +-
> > > arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts | 2 +-
> > > arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts | 2 +-
> > > arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts | 2 +-
> > > arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | 2 +-
> > > arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +-
> > > arch/arm64/boot/dts/marvell/armada-372x.dtsi | 2 +-
> > > 8 files changed, 8 insertions(+), 8 deletions(-)
> > >
> > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> > > index bd4e61d5448e..0cfb38492021 100644
> > > --- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> > > @@ -18,7 +18,7 @@
> > >
> > > / {
> > > model = "Marvell Armada 3720 Development Board DB-88F3720-DDR3";
> > > - compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3710";
> > > + compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3700";
> > >
> > > chosen {
> > > stdout-path = "serial0:115200n8";
> > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> > > index 5c4d8f379704..6715a19c1483 100644
> > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> > > @@ -18,7 +18,7 @@
> > > / {
> > > model = "Globalscale Marvell ESPRESSOBin Board (eMMC)";
> > > compatible = "globalscale,espressobin-emmc", "globalscale,espressobin",
> > > - "marvell,armada3720", "marvell,armada3710";
> > > + "marvell,armada3720", "marvell,armada3700";
> > > };
> > >
> > > &sdhci0 {
> > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> > > index 070725b81be5..447760b69850 100644
> > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> > > @@ -13,7 +13,7 @@
> > > / {
> > > model = "Globalscale Marvell ESPRESSOBin Ultra Board";
> > > compatible = "globalscale,espressobin-ultra", "marvell,armada3720",
> > > - "marvell,armada3710";
> > > + "marvell,armada3700";
> > >
> > > aliases {
> > > /* ethernet1 is WAN port */
> > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> > > index 75401eab4d42..2a8aa3901a9f 100644
> > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> > > @@ -19,7 +19,7 @@
> > > model = "Globalscale Marvell ESPRESSOBin Board V7 (eMMC)";
> > > compatible = "globalscale,espressobin-v7-emmc", "globalscale,espressobin-v7",
> > > "globalscale,espressobin", "marvell,armada3720",
> > > - "marvell,armada3710";
> > > + "marvell,armada3700";
> > >
> > > aliases {
> > > /* ethernet1 is wan port */
> > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> > > index 48a7f50fb427..b03af87611a9 100644
> > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> > > @@ -18,7 +18,7 @@
> > > / {
> > > model = "Globalscale Marvell ESPRESSOBin Board V7";
> > > compatible = "globalscale,espressobin-v7", "globalscale,espressobin",
> > > - "marvell,armada3720", "marvell,armada3710";
> > > + "marvell,armada3720", "marvell,armada3700";
> > >
> > > aliases {
> > > /* ethernet1 is wan port */
> > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> > > index 1542d836c090..c5a834b33b77 100644
> > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> > > @@ -16,5 +16,5 @@
> > >
> > > / {
> > > model = "Globalscale Marvell ESPRESSOBin Board";
> > > - compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
> > > + compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
> > > };
> > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> > > index caf9c8529fca..5840ed129309 100644
> > > --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> > > @@ -14,7 +14,7 @@
> > > / {
> > > model = "CZ.NIC Turris Mox Board";
> > > compatible = "cznic,turris-mox", "marvell,armada3720",
> > > - "marvell,armada3710";
> > > + "marvell,armada3700";
> > >
> > > aliases {
> > > spi0 = &spi0;
> > > diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > index 5ce55bdbb995..02ae1e153288 100644
> > > --- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > +++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > @@ -13,7 +13,7 @@
> > >
> > > / {
> > > model = "Marvell Armada 3720 SoC";
> > > - compatible = "marvell,armada3720", "marvell,armada3710";
> > > + compatible = "marvell,armada3720", "marvell,armada3700";
> > >
> > > cpus {
> > > cpu1: cpu@1 {
> > > --
> > > 2.20.1
> > >

2022-11-28 19:05:01

by Pali Rohár

Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

PING?

On Tuesday 01 November 2022 23:44:57 Pali Rohár wrote:
> PING?
>
> On Sunday 09 October 2022 14:06:39 Pali Rohár wrote:
> > PING
> >
> > On Saturday 01 October 2022 01:38:02 Pali Rohár wrote:
> > > Gregory: ping
> > >
> > > On Wednesday 13 July 2022 14:56:44 Pali Rohár wrote:
> > > > All Armada 3720 boards have Armada 3720 processor which is of Armada 3700
> > > > family and do not have Armada 3710 processor. So none of them should have
> > > > compatible string for Armada 3710 processor.
> > > >
> > > > Fix compatible string for all these boards by removing wrong processor
> > > > string "marvell,armada3710" and adding family string "marvell,armada3700"
> > > > as the last one. (Note that this is same way how are defined Armada 3710
> > > > DTS files).
> > > >
> > > > Signed-off-by: Pali Rohár <[email protected]>
> > > > ---
> > > > arch/arm64/boot/dts/marvell/armada-3720-db.dts | 2 +-
> > > > arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts | 2 +-
> > > > arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts | 2 +-
> > > > arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts | 2 +-
> > > > arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts | 2 +-
> > > > arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | 2 +-
> > > > arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +-
> > > > arch/arm64/boot/dts/marvell/armada-372x.dtsi | 2 +-
> > > > 8 files changed, 8 insertions(+), 8 deletions(-)
> > > >
> > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> > > > index bd4e61d5448e..0cfb38492021 100644
> > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> > > > @@ -18,7 +18,7 @@
> > > >
> > > > / {
> > > > model = "Marvell Armada 3720 Development Board DB-88F3720-DDR3";
> > > > - compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3710";
> > > > + compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3700";
> > > >
> > > > chosen {
> > > > stdout-path = "serial0:115200n8";
> > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> > > > index 5c4d8f379704..6715a19c1483 100644
> > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> > > > @@ -18,7 +18,7 @@
> > > > / {
> > > > model = "Globalscale Marvell ESPRESSOBin Board (eMMC)";
> > > > compatible = "globalscale,espressobin-emmc", "globalscale,espressobin",
> > > > - "marvell,armada3720", "marvell,armada3710";
> > > > + "marvell,armada3720", "marvell,armada3700";
> > > > };
> > > >
> > > > &sdhci0 {
> > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> > > > index 070725b81be5..447760b69850 100644
> > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> > > > @@ -13,7 +13,7 @@
> > > > / {
> > > > model = "Globalscale Marvell ESPRESSOBin Ultra Board";
> > > > compatible = "globalscale,espressobin-ultra", "marvell,armada3720",
> > > > - "marvell,armada3710";
> > > > + "marvell,armada3700";
> > > >
> > > > aliases {
> > > > /* ethernet1 is WAN port */
> > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> > > > index 75401eab4d42..2a8aa3901a9f 100644
> > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> > > > @@ -19,7 +19,7 @@
> > > > model = "Globalscale Marvell ESPRESSOBin Board V7 (eMMC)";
> > > > compatible = "globalscale,espressobin-v7-emmc", "globalscale,espressobin-v7",
> > > > "globalscale,espressobin", "marvell,armada3720",
> > > > - "marvell,armada3710";
> > > > + "marvell,armada3700";
> > > >
> > > > aliases {
> > > > /* ethernet1 is wan port */
> > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> > > > index 48a7f50fb427..b03af87611a9 100644
> > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> > > > @@ -18,7 +18,7 @@
> > > > / {
> > > > model = "Globalscale Marvell ESPRESSOBin Board V7";
> > > > compatible = "globalscale,espressobin-v7", "globalscale,espressobin",
> > > > - "marvell,armada3720", "marvell,armada3710";
> > > > + "marvell,armada3720", "marvell,armada3700";
> > > >
> > > > aliases {
> > > > /* ethernet1 is wan port */
> > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> > > > index 1542d836c090..c5a834b33b77 100644
> > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> > > > @@ -16,5 +16,5 @@
> > > >
> > > > / {
> > > > model = "Globalscale Marvell ESPRESSOBin Board";
> > > > - compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
> > > > + compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
> > > > };
> > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> > > > index caf9c8529fca..5840ed129309 100644
> > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> > > > @@ -14,7 +14,7 @@
> > > > / {
> > > > model = "CZ.NIC Turris Mox Board";
> > > > compatible = "cznic,turris-mox", "marvell,armada3720",
> > > > - "marvell,armada3710";
> > > > + "marvell,armada3700";
> > > >
> > > > aliases {
> > > > spi0 = &spi0;
> > > > diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > > index 5ce55bdbb995..02ae1e153288 100644
> > > > --- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > > +++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > > @@ -13,7 +13,7 @@
> > > >
> > > > / {
> > > > model = "Marvell Armada 3720 SoC";
> > > > - compatible = "marvell,armada3720", "marvell,armada3710";
> > > > + compatible = "marvell,armada3720", "marvell,armada3700";
> > > >
> > > > cpus {
> > > > cpu1: cpu@1 {
> > > > --
> > > > 2.20.1
> > > >

2022-12-16 18:53:38

by Pali Rohár

Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

PING?

On Monday 28 November 2022 19:21:27 Pali Rohár wrote:
> PING?
>
> On Tuesday 01 November 2022 23:44:57 Pali Rohár wrote:
> > PING?
> >
> > On Sunday 09 October 2022 14:06:39 Pali Rohár wrote:
> > > PING
> > >
> > > On Saturday 01 October 2022 01:38:02 Pali Rohár wrote:
> > > > Gregory: ping
> > > >
> > > > On Wednesday 13 July 2022 14:56:44 Pali Rohár wrote:
> > > > > All Armada 3720 boards have Armada 3720 processor which is of Armada 3700
> > > > > family and do not have Armada 3710 processor. So none of them should have
> > > > > compatible string for Armada 3710 processor.
> > > > >
> > > > > Fix compatible string for all these boards by removing wrong processor
> > > > > string "marvell,armada3710" and adding family string "marvell,armada3700"
> > > > > as the last one. (Note that this is same way how are defined Armada 3710
> > > > > DTS files).
> > > > >
> > > > > Signed-off-by: Pali Rohár <[email protected]>
> > > > > ---
> > > > > arch/arm64/boot/dts/marvell/armada-3720-db.dts | 2 +-
> > > > > arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts | 2 +-
> > > > > arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts | 2 +-
> > > > > arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts | 2 +-
> > > > > arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts | 2 +-
> > > > > arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | 2 +-
> > > > > arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +-
> > > > > arch/arm64/boot/dts/marvell/armada-372x.dtsi | 2 +-
> > > > > 8 files changed, 8 insertions(+), 8 deletions(-)
> > > > >
> > > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> > > > > index bd4e61d5448e..0cfb38492021 100644
> > > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> > > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> > > > > @@ -18,7 +18,7 @@
> > > > >
> > > > > / {
> > > > > model = "Marvell Armada 3720 Development Board DB-88F3720-DDR3";
> > > > > - compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3710";
> > > > > + compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3700";
> > > > >
> > > > > chosen {
> > > > > stdout-path = "serial0:115200n8";
> > > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> > > > > index 5c4d8f379704..6715a19c1483 100644
> > > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> > > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> > > > > @@ -18,7 +18,7 @@
> > > > > / {
> > > > > model = "Globalscale Marvell ESPRESSOBin Board (eMMC)";
> > > > > compatible = "globalscale,espressobin-emmc", "globalscale,espressobin",
> > > > > - "marvell,armada3720", "marvell,armada3710";
> > > > > + "marvell,armada3720", "marvell,armada3700";
> > > > > };
> > > > >
> > > > > &sdhci0 {
> > > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> > > > > index 070725b81be5..447760b69850 100644
> > > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> > > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> > > > > @@ -13,7 +13,7 @@
> > > > > / {
> > > > > model = "Globalscale Marvell ESPRESSOBin Ultra Board";
> > > > > compatible = "globalscale,espressobin-ultra", "marvell,armada3720",
> > > > > - "marvell,armada3710";
> > > > > + "marvell,armada3700";
> > > > >
> > > > > aliases {
> > > > > /* ethernet1 is WAN port */
> > > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> > > > > index 75401eab4d42..2a8aa3901a9f 100644
> > > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> > > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> > > > > @@ -19,7 +19,7 @@
> > > > > model = "Globalscale Marvell ESPRESSOBin Board V7 (eMMC)";
> > > > > compatible = "globalscale,espressobin-v7-emmc", "globalscale,espressobin-v7",
> > > > > "globalscale,espressobin", "marvell,armada3720",
> > > > > - "marvell,armada3710";
> > > > > + "marvell,armada3700";
> > > > >
> > > > > aliases {
> > > > > /* ethernet1 is wan port */
> > > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> > > > > index 48a7f50fb427..b03af87611a9 100644
> > > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> > > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> > > > > @@ -18,7 +18,7 @@
> > > > > / {
> > > > > model = "Globalscale Marvell ESPRESSOBin Board V7";
> > > > > compatible = "globalscale,espressobin-v7", "globalscale,espressobin",
> > > > > - "marvell,armada3720", "marvell,armada3710";
> > > > > + "marvell,armada3720", "marvell,armada3700";
> > > > >
> > > > > aliases {
> > > > > /* ethernet1 is wan port */
> > > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> > > > > index 1542d836c090..c5a834b33b77 100644
> > > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> > > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> > > > > @@ -16,5 +16,5 @@
> > > > >
> > > > > / {
> > > > > model = "Globalscale Marvell ESPRESSOBin Board";
> > > > > - compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
> > > > > + compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
> > > > > };
> > > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> > > > > index caf9c8529fca..5840ed129309 100644
> > > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> > > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> > > > > @@ -14,7 +14,7 @@
> > > > > / {
> > > > > model = "CZ.NIC Turris Mox Board";
> > > > > compatible = "cznic,turris-mox", "marvell,armada3720",
> > > > > - "marvell,armada3710";
> > > > > + "marvell,armada3700";
> > > > >
> > > > > aliases {
> > > > > spi0 = &spi0;
> > > > > diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > > > index 5ce55bdbb995..02ae1e153288 100644
> > > > > --- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > > > +++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > > > @@ -13,7 +13,7 @@
> > > > >
> > > > > / {
> > > > > model = "Marvell Armada 3720 SoC";
> > > > > - compatible = "marvell,armada3720", "marvell,armada3710";
> > > > > + compatible = "marvell,armada3720", "marvell,armada3700";
> > > > >
> > > > > cpus {
> > > > > cpu1: cpu@1 {
> > > > > --
> > > > > 2.20.1
> > > > >

2023-01-22 11:46:06

by Pali Rohár

Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

PING?

On Friday 16 December 2022 19:21:15 Pali Rohár wrote:
> PING?
>
> On Monday 28 November 2022 19:21:27 Pali Rohár wrote:
> > PING?
> >
> > On Tuesday 01 November 2022 23:44:57 Pali Rohár wrote:
> > > PING?
> > >
> > > On Sunday 09 October 2022 14:06:39 Pali Rohár wrote:
> > > > PING
> > > >
> > > > On Saturday 01 October 2022 01:38:02 Pali Rohár wrote:
> > > > > Gregory: ping
> > > > >
> > > > > On Wednesday 13 July 2022 14:56:44 Pali Rohár wrote:
> > > > > > All Armada 3720 boards have Armada 3720 processor which is of Armada 3700
> > > > > > family and do not have Armada 3710 processor. So none of them should have
> > > > > > compatible string for Armada 3710 processor.
> > > > > >
> > > > > > Fix compatible string for all these boards by removing wrong processor
> > > > > > string "marvell,armada3710" and adding family string "marvell,armada3700"
> > > > > > as the last one. (Note that this is same way how are defined Armada 3710
> > > > > > DTS files).
> > > > > >
> > > > > > Signed-off-by: Pali Rohár <[email protected]>
> > > > > > ---
> > > > > > arch/arm64/boot/dts/marvell/armada-3720-db.dts | 2 +-
> > > > > > arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts | 2 +-
> > > > > > arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts | 2 +-
> > > > > > arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts | 2 +-
> > > > > > arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts | 2 +-
> > > > > > arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | 2 +-
> > > > > > arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +-
> > > > > > arch/arm64/boot/dts/marvell/armada-372x.dtsi | 2 +-
> > > > > > 8 files changed, 8 insertions(+), 8 deletions(-)
> > > > > >
> > > > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> > > > > > index bd4e61d5448e..0cfb38492021 100644
> > > > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> > > > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> > > > > > @@ -18,7 +18,7 @@
> > > > > >
> > > > > > / {
> > > > > > model = "Marvell Armada 3720 Development Board DB-88F3720-DDR3";
> > > > > > - compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3710";
> > > > > > + compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3700";
> > > > > >
> > > > > > chosen {
> > > > > > stdout-path = "serial0:115200n8";
> > > > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> > > > > > index 5c4d8f379704..6715a19c1483 100644
> > > > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> > > > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> > > > > > @@ -18,7 +18,7 @@
> > > > > > / {
> > > > > > model = "Globalscale Marvell ESPRESSOBin Board (eMMC)";
> > > > > > compatible = "globalscale,espressobin-emmc", "globalscale,espressobin",
> > > > > > - "marvell,armada3720", "marvell,armada3710";
> > > > > > + "marvell,armada3720", "marvell,armada3700";
> > > > > > };
> > > > > >
> > > > > > &sdhci0 {
> > > > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> > > > > > index 070725b81be5..447760b69850 100644
> > > > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> > > > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> > > > > > @@ -13,7 +13,7 @@
> > > > > > / {
> > > > > > model = "Globalscale Marvell ESPRESSOBin Ultra Board";
> > > > > > compatible = "globalscale,espressobin-ultra", "marvell,armada3720",
> > > > > > - "marvell,armada3710";
> > > > > > + "marvell,armada3700";
> > > > > >
> > > > > > aliases {
> > > > > > /* ethernet1 is WAN port */
> > > > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> > > > > > index 75401eab4d42..2a8aa3901a9f 100644
> > > > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> > > > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> > > > > > @@ -19,7 +19,7 @@
> > > > > > model = "Globalscale Marvell ESPRESSOBin Board V7 (eMMC)";
> > > > > > compatible = "globalscale,espressobin-v7-emmc", "globalscale,espressobin-v7",
> > > > > > "globalscale,espressobin", "marvell,armada3720",
> > > > > > - "marvell,armada3710";
> > > > > > + "marvell,armada3700";
> > > > > >
> > > > > > aliases {
> > > > > > /* ethernet1 is wan port */
> > > > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> > > > > > index 48a7f50fb427..b03af87611a9 100644
> > > > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> > > > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> > > > > > @@ -18,7 +18,7 @@
> > > > > > / {
> > > > > > model = "Globalscale Marvell ESPRESSOBin Board V7";
> > > > > > compatible = "globalscale,espressobin-v7", "globalscale,espressobin",
> > > > > > - "marvell,armada3720", "marvell,armada3710";
> > > > > > + "marvell,armada3720", "marvell,armada3700";
> > > > > >
> > > > > > aliases {
> > > > > > /* ethernet1 is wan port */
> > > > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> > > > > > index 1542d836c090..c5a834b33b77 100644
> > > > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> > > > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> > > > > > @@ -16,5 +16,5 @@
> > > > > >
> > > > > > / {
> > > > > > model = "Globalscale Marvell ESPRESSOBin Board";
> > > > > > - compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
> > > > > > + compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
> > > > > > };
> > > > > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> > > > > > index caf9c8529fca..5840ed129309 100644
> > > > > > --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> > > > > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> > > > > > @@ -14,7 +14,7 @@
> > > > > > / {
> > > > > > model = "CZ.NIC Turris Mox Board";
> > > > > > compatible = "cznic,turris-mox", "marvell,armada3720",
> > > > > > - "marvell,armada3710";
> > > > > > + "marvell,armada3700";
> > > > > >
> > > > > > aliases {
> > > > > > spi0 = &spi0;
> > > > > > diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > > > > index 5ce55bdbb995..02ae1e153288 100644
> > > > > > --- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > > > > +++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> > > > > > @@ -13,7 +13,7 @@
> > > > > >
> > > > > > / {
> > > > > > model = "Marvell Armada 3720 SoC";
> > > > > > - compatible = "marvell,armada3720", "marvell,armada3710";
> > > > > > + compatible = "marvell,armada3720", "marvell,armada3700";
> > > > > >
> > > > > > cpus {
> > > > > > cpu1: cpu@1 {
> > > > > > --
> > > > > > 2.20.1
> > > > > >

2023-02-01 07:47:03

by Gregory CLEMENT

Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

Pali Rohár <[email protected]> writes:

> All Armada 3720 boards have Armada 3720 processor which is of Armada 3700
> family and do not have Armada 3710 processor. So none of them should have
> compatible string for Armada 3710 processor.
>
> Fix compatible string for all these boards by removing wrong processor
> string "marvell,armada3710" and adding family string "marvell,armada3700"
> as the last one. (Note that this is same way how are defined Armada 3710
> DTS files).
>
> Signed-off-by: Pali Rohár <[email protected]>


Fixedd a marge conflict and applied on mvebu/dt64

Thanks,

Gregory

> ---
> arch/arm64/boot/dts/marvell/armada-3720-db.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +-
> arch/arm64/boot/dts/marvell/armada-372x.dtsi | 2 +-
> 8 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> index bd4e61d5448e..0cfb38492021 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> @@ -18,7 +18,7 @@
>
> / {
> model = "Marvell Armada 3720 Development Board DB-88F3720-DDR3";
> - compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3710";
> + compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3700";
>
> chosen {
> stdout-path = "serial0:115200n8";
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> index 5c4d8f379704..6715a19c1483 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> @@ -18,7 +18,7 @@
> / {
> model = "Globalscale Marvell ESPRESSOBin Board (eMMC)";
> compatible = "globalscale,espressobin-emmc", "globalscale,espressobin",
> - "marvell,armada3720", "marvell,armada3710";
> + "marvell,armada3720", "marvell,armada3700";
> };
>
> &sdhci0 {
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> index 070725b81be5..447760b69850 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> @@ -13,7 +13,7 @@
> / {
> model = "Globalscale Marvell ESPRESSOBin Ultra Board";
> compatible = "globalscale,espressobin-ultra", "marvell,armada3720",
> - "marvell,armada3710";
> + "marvell,armada3700";
>
> aliases {
> /* ethernet1 is WAN port */
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> index 75401eab4d42..2a8aa3901a9f 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> @@ -19,7 +19,7 @@
> model = "Globalscale Marvell ESPRESSOBin Board V7 (eMMC)";
> compatible = "globalscale,espressobin-v7-emmc", "globalscale,espressobin-v7",
> "globalscale,espressobin", "marvell,armada3720",
> - "marvell,armada3710";
> + "marvell,armada3700";
>
> aliases {
> /* ethernet1 is wan port */
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> index 48a7f50fb427..b03af87611a9 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> @@ -18,7 +18,7 @@
> / {
> model = "Globalscale Marvell ESPRESSOBin Board V7";
> compatible = "globalscale,espressobin-v7", "globalscale,espressobin",
> - "marvell,armada3720", "marvell,armada3710";
> + "marvell,armada3720", "marvell,armada3700";
>
> aliases {
> /* ethernet1 is wan port */
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> index 1542d836c090..c5a834b33b77 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> @@ -16,5 +16,5 @@
>
> / {
> model = "Globalscale Marvell ESPRESSOBin Board";
> - compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
> + compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
> };
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> index caf9c8529fca..5840ed129309 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> @@ -14,7 +14,7 @@
> / {
> model = "CZ.NIC Turris Mox Board";
> compatible = "cznic,turris-mox", "marvell,armada3720",
> - "marvell,armada3710";
> + "marvell,armada3700";
>
> aliases {
> spi0 = &spi0;
> diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> index 5ce55bdbb995..02ae1e153288 100644
> --- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> @@ -13,7 +13,7 @@
>
> / {
> model = "Marvell Armada 3720 SoC";
> - compatible = "marvell,armada3720", "marvell,armada3710";
> + compatible = "marvell,armada3720", "marvell,armada3700";
>
> cpus {
> cpu1: cpu@1 {
> --
> 2.20.1
>

--
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com