arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

PATCH In review Pali Rohár 4 participants 17 messages Jul 13, 2022 – Feb 1, 2023

Subsystems (2)

Device tree bindings Arm/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SoC support

lore

Share & tools

lore

Pali Rohár

author

2022-07-13 13:50 UTC #0 lore raw

PATCH 1/1 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(-)

arch/arm64/boot/dts/marvell/armada-3720-db.dts +1 -1

index bd4e61d5448e..0cfb38492021 100644
@@ -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";

arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts +1 -1

index 5c4d8f379704..6715a19c1483 100644
@@ -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 {

arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts +1 -1

index 070725b81be5..447760b69850 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts +1 -1

index 75401eab4d42..2a8aa3901a9f 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts +1 -1

index 48a7f50fb427..b03af87611a9 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +1 -1

index 1542d836c090..c5a834b33b77 100644
@@ -16,5 +16,5 @@
 
 / {
 	model = "Globalscale Marvell ESPRESSOBin Board";
-	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
+	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
 };

arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +1 -1

index caf9c8529fca..5840ed129309 100644
@@ -14,7 +14,7 @@
 / {
 	model = "CZ.NIC Turris Mox Board";
 	compatible = "cznic,turris-mox", "marvell,armada3720",
-		     "marvell,armada3710";
+		     "marvell,armada3700";
 
 	aliases {
 		spi0 = &spi0;

arch/arm64/boot/dts/marvell/armada-372x.dtsi +1 -1

index 5ce55bdbb995..02ae1e153288 100644
@@ -13,7 +13,7 @@
 
 / {
 	model = "Marvell Armada 3720 SoC";
-	compatible = "marvell,armada3720", "marvell,armada3710";
+	compatible = "marvell,armada3720", "marvell,armada3700";
 
 	cpus {
 		cpu1: cpu@1 {

Signature · 1 line

2.20.1

Krzysztof Kozlowski

2022-07-13 19:42 UTC #1 lore raw

Quoted 8 lines · Pali Rohár

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

Pali Rohár

author

2022-07-13 20:03 UTC #2 lore raw

Quoted 10 lines · On Wednesday 13 July 2022 21:42:43 Krzysztof Kozlowski wrote:

Quoted 8 lines · Pali Rohár
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).

Quoted 8 lines

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]/

Krzysztof Kozlowski

2022-07-14 06:56 UTC #3 lore raw

Quoted 17 lines · Pali Rohár

Quoted 16 lines · On Wednesday 13 July 2022 21:42:43 Krzysztof Kozlowski wrote:
Quoted 8 lines · Pali Rohár
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.

Quoted 5 lines

Quoted 2 lines
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

Pali Rohár

author

2022-07-14 09:36 UTC #4 lore raw

Quoted 18 lines · On Thursday 14 July 2022 08:56:12 Krzysztof Kozlowski wrote:

Quoted 17 lines · Pali Rohár
Quoted 16 lines · On Wednesday 13 July 2022 21:42:43 Krzysztof Kozlowski wrote:
Quoted 8 lines · Pali Rohár
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.

Quoted 7 lines

Quoted 5 lines
Quoted 2 lines
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?

Quoted 4 lines

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

Pali Rohár

author

2022-08-08 20:25 UTC #5 lore raw

In reply to Pali Rohár

PING?

Quoted 126 lines · 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.

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(-)

arch/arm64/boot/dts/marvell/armada-3720-db.dts +1 -1

index bd4e61d5448e..0cfb38492021 100644
@@ -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";

arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts +1 -1

index 5c4d8f379704..6715a19c1483 100644
@@ -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 {

arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts +1 -1

index 070725b81be5..447760b69850 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts +1 -1

index 75401eab4d42..2a8aa3901a9f 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts +1 -1

index 48a7f50fb427..b03af87611a9 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +1 -1

index 1542d836c090..c5a834b33b77 100644
@@ -16,5 +16,5 @@
 
 / {
 	model = "Globalscale Marvell ESPRESSOBin Board";
-	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
+	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
 };

arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +1 -1

index caf9c8529fca..5840ed129309 100644
@@ -14,7 +14,7 @@
 / {
 	model = "CZ.NIC Turris Mox Board";
 	compatible = "cznic,turris-mox", "marvell,armada3720",
-		     "marvell,armada3710";
+		     "marvell,armada3700";
 
 	aliases {
 		spi0 = &spi0;

arch/arm64/boot/dts/marvell/armada-372x.dtsi +1 -1

index 5ce55bdbb995..02ae1e153288 100644
@@ -13,7 +13,7 @@
 
 / {
 	model = "Marvell Armada 3720 SoC";
-	compatible = "marvell,armada3720", "marvell,armada3710";
+	compatible = "marvell,armada3720", "marvell,armada3700";
 
 	cpus {
 		cpu1: cpu@1 {

Signature · 1 line

2.20.1

Andrew Lunn

maintainer

2022-08-08 20:33 UTC #6 lore raw

Quoted 1 line · Pali Rohár

PING?

It is too late for the merge window.

Quoted 10 lines

arch/arm64/boot/dts/marvell/armada-372x.dtsi line 16
Quoted 10 lines
arch/arm64/boot/dts/marvell/armada-372x.dtsi +1 -1
index 5ce55bdbb995..02ae1e153288 100644
@@ -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

Pali Rohár

author

2022-08-08 20:39 UTC #7 lore raw

Quoted 20 lines · On Monday 08 August 2022 22:33:30 Andrew Lunn wrote:

Quoted 1 line · Pali Rohár
PING?
It is too late for the merge window.
Quoted 10 lines
arch/arm64/boot/dts/marvell/armada-372x.dtsi line 16
Quoted 10 lines
arch/arm64/boot/dts/marvell/armada-372x.dtsi +1 -1
index 5ce55bdbb995..02ae1e153288 100644
@@ -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.

Quoted 1 line

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.

Pali Rohár

author

2022-09-02 22:31 UTC #8 lore raw

In reply to Andrew Lunn

Quoted 4 lines · On Monday 08 August 2022 22:33:30 Andrew Lunn wrote:

Quoted 1 line · Pali Rohár
PING?
It is too late for the merge window.

So, now for the next?

Quoted 16 lines

Quoted 10 lines
arch/arm64/boot/dts/marvell/armada-372x.dtsi line 16
Quoted 10 lines
arch/arm64/boot/dts/marvell/armada-372x.dtsi +1 -1
index 5ce55bdbb995..02ae1e153288 100644
@@ -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

Pali Rohár

author

2022-09-19 23:20 UTC #9 lore raw

Quoted 7 lines · On Saturday 03 September 2022 00:31:10 Pali Rohár wrote:

Quoted 4 lines · On Monday 08 August 2022 22:33:30 Andrew Lunn wrote:
Quoted 1 line · Pali Rohár
PING?
It is too late for the merge window.
So, now for the next?

PING?

Quoted 16 lines

Quoted 16 lines
Quoted 10 lines
arch/arm64/boot/dts/marvell/armada-372x.dtsi line 16
Quoted 10 lines
arch/arm64/boot/dts/marvell/armada-372x.dtsi +1 -1
index 5ce55bdbb995..02ae1e153288 100644
@@ -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

Pali Rohár

author

2022-09-30 23:38 UTC #10 lore raw

In reply to Pali Rohár

Gregory: ping

Quoted 126 lines · 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.

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(-)

arch/arm64/boot/dts/marvell/armada-3720-db.dts +1 -1

index bd4e61d5448e..0cfb38492021 100644
@@ -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";

arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts +1 -1

index 5c4d8f379704..6715a19c1483 100644
@@ -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 {

arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts +1 -1

index 070725b81be5..447760b69850 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts +1 -1

index 75401eab4d42..2a8aa3901a9f 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts +1 -1

index 48a7f50fb427..b03af87611a9 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +1 -1

index 1542d836c090..c5a834b33b77 100644
@@ -16,5 +16,5 @@
 
 / {
 	model = "Globalscale Marvell ESPRESSOBin Board";
-	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
+	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
 };

arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +1 -1

index caf9c8529fca..5840ed129309 100644
@@ -14,7 +14,7 @@
 / {
 	model = "CZ.NIC Turris Mox Board";
 	compatible = "cznic,turris-mox", "marvell,armada3720",
-		     "marvell,armada3710";
+		     "marvell,armada3700";
 
 	aliases {
 		spi0 = &spi0;

arch/arm64/boot/dts/marvell/armada-372x.dtsi +1 -1

index 5ce55bdbb995..02ae1e153288 100644
@@ -13,7 +13,7 @@
 
 / {
 	model = "Marvell Armada 3720 SoC";
-	compatible = "marvell,armada3720", "marvell,armada3710";
+	compatible = "marvell,armada3720", "marvell,armada3700";
 
 	cpus {
 		cpu1: cpu@1 {

Signature · 1 line

2.20.1

Pali Rohár

author

2022-10-09 12:06 UTC #11 lore raw

PING

Quoted 129 lines · On Saturday 01 October 2022 01:38:02 Pali Rohár wrote:

Gregory: ping

Quoted 126 lines · 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.

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(-)

arch/arm64/boot/dts/marvell/armada-3720-db.dts +1 -1

index bd4e61d5448e..0cfb38492021 100644
@@ -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";

arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts +1 -1

index 5c4d8f379704..6715a19c1483 100644
@@ -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 {

arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts +1 -1

index 070725b81be5..447760b69850 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts +1 -1

index 75401eab4d42..2a8aa3901a9f 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts +1 -1

index 48a7f50fb427..b03af87611a9 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +1 -1

index 1542d836c090..c5a834b33b77 100644
@@ -16,5 +16,5 @@
 
 / {
 	model = "Globalscale Marvell ESPRESSOBin Board";
-	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
+	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
 };

arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +1 -1

index caf9c8529fca..5840ed129309 100644
@@ -14,7 +14,7 @@
 / {
 	model = "CZ.NIC Turris Mox Board";
 	compatible = "cznic,turris-mox", "marvell,armada3720",
-		     "marvell,armada3710";
+		     "marvell,armada3700";
 
 	aliases {
 		spi0 = &spi0;

arch/arm64/boot/dts/marvell/armada-372x.dtsi +1 -1

index 5ce55bdbb995..02ae1e153288 100644
@@ -13,7 +13,7 @@
 
 / {
 	model = "Marvell Armada 3720 SoC";
-	compatible = "marvell,armada3720", "marvell,armada3710";
+	compatible = "marvell,armada3720", "marvell,armada3700";
 
 	cpus {
 		cpu1: cpu@1 {

Signature · 1 line

2.20.1

Pali Rohár

author

2022-11-01 22:45 UTC #12 lore raw

PING?

Quoted 132 lines · On Sunday 09 October 2022 14:06:39 Pali Rohár wrote:

PING

Quoted 129 lines · On Saturday 01 October 2022 01:38:02 Pali Rohár wrote:

Gregory: ping

Quoted 126 lines · 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.

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(-)

arch/arm64/boot/dts/marvell/armada-3720-db.dts +1 -1

index bd4e61d5448e..0cfb38492021 100644
@@ -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";

arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts +1 -1

index 5c4d8f379704..6715a19c1483 100644
@@ -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 {

arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts +1 -1

index 070725b81be5..447760b69850 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts +1 -1

index 75401eab4d42..2a8aa3901a9f 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts +1 -1

index 48a7f50fb427..b03af87611a9 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +1 -1

index 1542d836c090..c5a834b33b77 100644
@@ -16,5 +16,5 @@
 
 / {
 	model = "Globalscale Marvell ESPRESSOBin Board";
-	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
+	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
 };

arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +1 -1

index caf9c8529fca..5840ed129309 100644
@@ -14,7 +14,7 @@
 / {
 	model = "CZ.NIC Turris Mox Board";
 	compatible = "cznic,turris-mox", "marvell,armada3720",
-		     "marvell,armada3710";
+		     "marvell,armada3700";
 
 	aliases {
 		spi0 = &spi0;

arch/arm64/boot/dts/marvell/armada-372x.dtsi +1 -1

index 5ce55bdbb995..02ae1e153288 100644
@@ -13,7 +13,7 @@
 
 / {
 	model = "Marvell Armada 3720 SoC";
-	compatible = "marvell,armada3720", "marvell,armada3710";
+	compatible = "marvell,armada3720", "marvell,armada3700";
 
 	cpus {
 		cpu1: cpu@1 {

Signature · 1 line

2.20.1

Pali Rohár

author

2022-11-28 18:29 UTC #13 lore raw

PING?

Quoted 135 lines · On Tuesday 01 November 2022 23:44:57 Pali Rohár wrote:

PING?

Quoted 132 lines · On Sunday 09 October 2022 14:06:39 Pali Rohár wrote:

PING

Quoted 129 lines · On Saturday 01 October 2022 01:38:02 Pali Rohár wrote:

Gregory: ping

Quoted 126 lines · 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.

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(-)

arch/arm64/boot/dts/marvell/armada-3720-db.dts +1 -1

index bd4e61d5448e..0cfb38492021 100644
@@ -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";

arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts +1 -1

index 5c4d8f379704..6715a19c1483 100644
@@ -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 {

arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts +1 -1

index 070725b81be5..447760b69850 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts +1 -1

index 75401eab4d42..2a8aa3901a9f 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts +1 -1

index 48a7f50fb427..b03af87611a9 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +1 -1

index 1542d836c090..c5a834b33b77 100644
@@ -16,5 +16,5 @@
 
 / {
 	model = "Globalscale Marvell ESPRESSOBin Board";
-	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
+	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
 };

arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +1 -1

index caf9c8529fca..5840ed129309 100644
@@ -14,7 +14,7 @@
 / {
 	model = "CZ.NIC Turris Mox Board";
 	compatible = "cznic,turris-mox", "marvell,armada3720",
-		     "marvell,armada3710";
+		     "marvell,armada3700";
 
 	aliases {
 		spi0 = &spi0;

arch/arm64/boot/dts/marvell/armada-372x.dtsi +1 -1

index 5ce55bdbb995..02ae1e153288 100644
@@ -13,7 +13,7 @@
 
 / {
 	model = "Marvell Armada 3720 SoC";
-	compatible = "marvell,armada3720", "marvell,armada3710";
+	compatible = "marvell,armada3720", "marvell,armada3700";
 
 	cpus {
 		cpu1: cpu@1 {

Signature · 1 line

2.20.1

Pali Rohár

author

2022-12-16 18:21 UTC #14 lore raw

PING?

Quoted 138 lines · On Monday 28 November 2022 19:21:27 Pali Rohár wrote:

PING?

Quoted 135 lines · On Tuesday 01 November 2022 23:44:57 Pali Rohár wrote:

PING?

Quoted 132 lines · On Sunday 09 October 2022 14:06:39 Pali Rohár wrote:

PING

Quoted 129 lines · On Saturday 01 October 2022 01:38:02 Pali Rohár wrote:

Gregory: ping

Quoted 126 lines · 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.

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(-)

arch/arm64/boot/dts/marvell/armada-3720-db.dts +1 -1

index bd4e61d5448e..0cfb38492021 100644
@@ -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";

arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts +1 -1

index 5c4d8f379704..6715a19c1483 100644
@@ -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 {

arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts +1 -1

index 070725b81be5..447760b69850 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts +1 -1

index 75401eab4d42..2a8aa3901a9f 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts +1 -1

index 48a7f50fb427..b03af87611a9 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +1 -1

index 1542d836c090..c5a834b33b77 100644
@@ -16,5 +16,5 @@
 
 / {
 	model = "Globalscale Marvell ESPRESSOBin Board";
-	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
+	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
 };

arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +1 -1

index caf9c8529fca..5840ed129309 100644
@@ -14,7 +14,7 @@
 / {
 	model = "CZ.NIC Turris Mox Board";
 	compatible = "cznic,turris-mox", "marvell,armada3720",
-		     "marvell,armada3710";
+		     "marvell,armada3700";
 
 	aliases {
 		spi0 = &spi0;

arch/arm64/boot/dts/marvell/armada-372x.dtsi +1 -1

index 5ce55bdbb995..02ae1e153288 100644
@@ -13,7 +13,7 @@
 
 / {
 	model = "Marvell Armada 3720 SoC";
-	compatible = "marvell,armada3720", "marvell,armada3710";
+	compatible = "marvell,armada3720", "marvell,armada3700";
 
 	cpus {
 		cpu1: cpu@1 {

Signature · 1 line

2.20.1

Pali Rohár

author

2023-01-22 11:28 UTC #15 lore raw

PING?

Quoted 141 lines · On Friday 16 December 2022 19:21:15 Pali Rohár wrote:

PING?

Quoted 138 lines · On Monday 28 November 2022 19:21:27 Pali Rohár wrote:

PING?

Quoted 135 lines · On Tuesday 01 November 2022 23:44:57 Pali Rohár wrote:

PING?

Quoted 132 lines · On Sunday 09 October 2022 14:06:39 Pali Rohár wrote:

PING

Quoted 129 lines · On Saturday 01 October 2022 01:38:02 Pali Rohár wrote:

Gregory: ping

Quoted 126 lines · 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.

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(-)

arch/arm64/boot/dts/marvell/armada-3720-db.dts +1 -1

index bd4e61d5448e..0cfb38492021 100644
@@ -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";

arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts +1 -1

index 5c4d8f379704..6715a19c1483 100644
@@ -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 {

arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts +1 -1

index 070725b81be5..447760b69850 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts +1 -1

index 75401eab4d42..2a8aa3901a9f 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts +1 -1

index 48a7f50fb427..b03af87611a9 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +1 -1

index 1542d836c090..c5a834b33b77 100644
@@ -16,5 +16,5 @@
 
 / {
 	model = "Globalscale Marvell ESPRESSOBin Board";
-	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
+	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
 };

arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +1 -1

index caf9c8529fca..5840ed129309 100644
@@ -14,7 +14,7 @@
 / {
 	model = "CZ.NIC Turris Mox Board";
 	compatible = "cznic,turris-mox", "marvell,armada3720",
-		     "marvell,armada3710";
+		     "marvell,armada3700";
 
 	aliases {
 		spi0 = &spi0;

arch/arm64/boot/dts/marvell/armada-372x.dtsi +1 -1

index 5ce55bdbb995..02ae1e153288 100644
@@ -13,7 +13,7 @@
 
 / {
 	model = "Marvell Armada 3720 SoC";
-	compatible = "marvell,armada3720", "marvell,armada3710";
+	compatible = "marvell,armada3720", "marvell,armada3700";
 
 	cpus {
 		cpu1: cpu@1 {

Signature · 1 line

2.20.1

Gregory CLEMENT

maintainer

2023-02-01 07:47 UTC #16 lore raw

In reply to Pali Rohár

Quoted 10 lines · Pali Rohár

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

Quoted 116 lines

---
 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(-)

arch/arm64/boot/dts/marvell/armada-3720-db.dts +1 -1

index bd4e61d5448e..0cfb38492021 100644
@@ -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";

arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts +1 -1

index 5c4d8f379704..6715a19c1483 100644
@@ -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 {

arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts +1 -1

index 070725b81be5..447760b69850 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts +1 -1

index 75401eab4d42..2a8aa3901a9f 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts +1 -1

index 48a7f50fb427..b03af87611a9 100644
@@ -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 */

arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +1 -1

index 1542d836c090..c5a834b33b77 100644
@@ -16,5 +16,5 @@
 
 / {
 	model = "Globalscale Marvell ESPRESSOBin Board";
-	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
+	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
 };

arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +1 -1

index caf9c8529fca..5840ed129309 100644
@@ -14,7 +14,7 @@
 / {
 	model = "CZ.NIC Turris Mox Board";
 	compatible = "cznic,turris-mox", "marvell,armada3720",
-		     "marvell,armada3710";
+		     "marvell,armada3700";
 
 	aliases {
 		spi0 = &spi0;

arch/arm64/boot/dts/marvell/armada-372x.dtsi +1 -1

index 5ce55bdbb995..02ae1e153288 100644
@@ -13,7 +13,7 @@
 
 / {
 	model = "Marvell Armada 3720 SoC";
-	compatible = "marvell,armada3720", "marvell,armada3710";
+	compatible = "marvell,armada3720", "marvell,armada3700";
 
 	cpus {
 		cpu1: cpu@1 {

Signature · 1 line

2.20.1

Signature · 3 lines

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