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).
[gclement: fix conflict for v6.2]
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
index bd4e61d..0cfb384 100644 (file)
--- 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 5c4d8f3..6715a19 100644 (file)
--- 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 1b2ed63..d29d2da 100644 (file)
--- 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", "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-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
index 75401ea..2a8aa39 100644 (file)
--- 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 48a7f50..b03af87 100644 (file)
--- 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 1542d83..c5a834b 100644 (file)
--- 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 cd09883..9eab2bb 100644 (file)
--- 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 5ce55bd..02ae1e1 100644 (file)
--- 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 {