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 bd4e61d5448eae3d02da0860e16db684620d2812..0cfb38492021b5fa023b3803a207131c0050fdad 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 5c4d8f379704e863819b81db402e8056185f7737..6715a19c148317c3e9bf254f55602d6385caf6ba 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 1b2ed63ae6a247a87879ee968f169ea12d1fc701..d29d2da95f4c3e78ed4f37273b9ee946ffc7c988 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 75401eab4d420eb13a670570f776dcb8ff93e33a..2a8aa3901a9fa4c4e024952b0f65a386f42f4d25 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 48a7f50fb427dcb40d815d90099bfbc1c384c0ed..b03af87611a97fbb07b334c607cb26eadf819a2d 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 1542d836c090074ef2890a17a86cfb896075f4e1..c5a834b33b7744258268eb760c7372fdf1ed4ae8 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 cd0988317623f001c4a2855c2bfb331703846b31..9eab2bb221348aaa4c04e0a4cca26e52907383b0 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 5ce55bdbb995b4e3c70e1a29deac86c64765998f..02ae1e153288212c0d44116441e067207255ccb4 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 {