arm64: dts: marvell: Fix missing/incorrect "marvell,armada3710" compatible

"marvell,armada3700" is not a documented compatible value. According to
the schema, "marvell,armada3720" SoCs should have a "marvell,armada3710"
fallback compatible.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
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 0cfb38492021b5fa023b3803a207131c0050fdad..bd4e61d5448eae3d02da0860e16db684620d2812 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,armada3700";
+       compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3710";
 
        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 6715a19c148317c3e9bf254f55602d6385caf6ba..5c4d8f379704e863819b81db402e8056185f7737 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,armada3700";
+                    "marvell,armada3720", "marvell,armada3710";
 };
 
 &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 b3cc2b7b5d192351ef8500c67c1d8c3514d842a2..97a180c8dcd918f5cd654f1630e0ee99abd72b19 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,armada3700";
+                    "marvell,armada3720", "marvell,armada3710";
 
        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 2a8aa3901a9fa4c4e024952b0f65a386f42f4d25..75401eab4d420eb13a670570f776dcb8ff93e33a 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,armada3700";
+                    "marvell,armada3710";
 
        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 b03af87611a97fbb07b334c607cb26eadf819a2d..48a7f50fb427dcb40d815d90099bfbc1c384c0ed 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,armada3700";
+                    "marvell,armada3720", "marvell,armada3710";
 
        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 c5a834b33b7744258268eb760c7372fdf1ed4ae8..1542d836c090074ef2890a17a86cfb896075f4e1 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,armada3700";
+       compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
 };

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts b/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
index 56930f2ce4814ee58ebd06b095db146a5cc55340..9f4bafeddd82f79de5bb88ab2b5b427254fc6221 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
@@ -7,7 +7,7 @@
 
 / {
        model = "GL.iNet GL-MV1000";
-       compatible = "glinet,gl-mv1000", "marvell,armada3720";
+       compatible = "glinet,gl-mv1000", "marvell,armada3720", "marvell,armada3710";
 
        aliases {
                led-boot = &led_power;

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 54453b0a91f9697f563f5a59f229f3491b608327..f4d73c8b1a6d31f29ae899be68bebcf096a1c66d 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,armada3700";
+                    "marvell,armada3710";
 
        aliases {
                spi0 = &spi0;