arm64: dts: marvell: Drop incomplete root compatible/model properties

The Marvell .dtsi files define model and compatible properties which
aren't complete. They are missing board compatible for example. This is
mostly harmless as the properties will typically get overwritten.
However, with these there will not be any warning should a board .dts
forget to define its compatible and model.

armada-371x.dtsi is not used anywhere, so it can be removed entirely
since there is nothing left in it.

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-371x.dtsi b/arch/arm64/boot/dts/marvell/armada-371x.dtsi
deleted file mode 100644 (file)
index dc1182e..0000000
--- a/arch/arm64/boot/dts/marvell/armada-371x.dtsi
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Device Tree Include file for Marvell Armada 371x family of SoCs
- * (also named 88F3710)
- *
- * Copyright (C) 2016 Marvell
- *
- * Gregory CLEMENT <gregory.clement@free-electrons.com>
- *
- */
-
-#include "armada-37xx.dtsi"
-
-/ {
-       model = "Marvell Armada 3710 SoC";
-       compatible = "marvell,armada3710", "marvell,armada3700";
-};

diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
index 02ae1e153288212c0d44116441e067207255ccb4..b99ac4c03a488b36a8be54cbed1db01d0f2b7265 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
@@ -12,9 +12,6 @@
 #include "armada-37xx.dtsi"
 
 / {
-       model = "Marvell Armada 3720 SoC";
-       compatible = "marvell,armada3720", "marvell,armada3700";
-
        cpus {
                cpu1: cpu@1 {
                        device_type = "cpu";

diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index 9603223dd761f1a5c84ee8aeaf29d5461094fa58..4e5ff7f67e33b67583fff5ef950c079a8798180e 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -11,8 +11,6 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 / {
-       model = "Marvell Armada 37xx SoC";
-       compatible = "marvell,armada3700";
        interrupt-parent = <&gic>;
        #address-cells = <2>;
        #size-cells = <2>;

diff --git a/arch/arm64/boot/dts/marvell/armada-7020.dtsi b/arch/arm64/boot/dts/marvell/armada-7020.dtsi
index 4e46326dd123cb066943e5bb03457f052c4b41fa..570f901b4f4af4da81df050d14ea4ad7dc1d5f41 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-7020.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-7020.dtsi
@@ -8,9 +8,3 @@
 
 #include "armada-ap806-dual.dtsi"
 #include "armada-70x0.dtsi"
-
-/ {
-       model = "Marvell Armada 7020";
-       compatible = "marvell,armada7020", "marvell,armada-ap806-dual",
-                    "marvell,armada-ap806";
-};

diff --git a/arch/arm64/boot/dts/marvell/armada-7040.dtsi b/arch/arm64/boot/dts/marvell/armada-7040.dtsi
index 2f440711d21d20a6e6cb061c0595342633282d95..710ac44870bd2286c980fa8379fef22b89ad5e2d 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-7040.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-7040.dtsi
@@ -9,12 +9,6 @@
 #include "armada-ap806-quad.dtsi"
 #include "armada-70x0.dtsi"
 
-/ {
-       model = "Marvell Armada 7040";
-       compatible = "marvell,armada7040", "marvell,armada-ap806-quad",
-                    "marvell,armada-ap806";
-};
-
 &cp0_pcie0 {
        iommu-map =
                <0x0   &smmu 0x480 0x20>,

diff --git a/arch/arm64/boot/dts/marvell/armada-8020.dtsi b/arch/arm64/boot/dts/marvell/armada-8020.dtsi
index ba1307c0fadbe016c0f56f0c119f5354e6c722e3..b6fc1887609355cbd599f470f554541224eda6cf 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8020.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-8020.dtsi
@@ -9,12 +9,6 @@
 #include "armada-ap806-dual.dtsi"
 #include "armada-80x0.dtsi"
 
-/ {
-       model = "Marvell Armada 8020";
-       compatible = "marvell,armada8020", "marvell,armada-ap806-dual",
-                    "marvell,armada-ap806";
-};
-
 /* The RTC requires external oscillator. But on Aramda 80x0, the RTC clock
  * in CP master is not connected (by package) to the oscillator. So
  * disable it. However, the RTC clock in CP slave is connected to the

diff --git a/arch/arm64/boot/dts/marvell/armada-8040.dtsi b/arch/arm64/boot/dts/marvell/armada-8040.dtsi
index 22c2d6ebf38187c67623d815b5b0df2ea1de38e8..3efd9b9e68926f79441e36f7265aebe2e024b0db 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-8040.dtsi
@@ -9,12 +9,6 @@
 #include "armada-ap806-quad.dtsi"
 #include "armada-80x0.dtsi"
 
-/ {
-       model = "Marvell Armada 8040";
-       compatible = "marvell,armada8040", "marvell,armada-ap806-quad",
-                    "marvell,armada-ap806";
-};
-
 &cp0_pcie0 {
        iommu-map =
                <0x0   &smmu 0x480 0x20>,

diff --git a/arch/arm64/boot/dts/marvell/armada-8080.dtsi b/arch/arm64/boot/dts/marvell/armada-8080.dtsi
index 299e814d1deda8a0f5b8b366d64063089cfd1308..32bb56f2fe3f23dce4cb501ed28a053b537513f6 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8080.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-8080.dtsi
@@ -6,9 +6,3 @@
  */
 
 #include "armada-ap810-ap0-octa-core.dtsi"
-
-/ {
-       model = "Marvell 8080 board";
-       compatible = "marvell,armada-8080", "marvell,armada-ap810-octa",
-                               "marvell,armada-ap810";
-};

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
index 3ed6fba1f4383d6353c710d5bdd2355a56201571..82f4dedfc25e546970646b8f9c476ef8c5985501 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
@@ -8,9 +8,6 @@
 #include "armada-ap806.dtsi"
 
 / {
-       model = "Marvell Armada AP806 Dual";
-       compatible = "marvell,armada-ap806-dual", "marvell,armada-ap806";
-
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi
index cf6a96ddcf40fccdce6626cf8db8499feb0b968b..f37f49c79a5071723720349513ef04d21adc2837 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi
@@ -8,9 +8,6 @@
 #include "armada-ap806.dtsi"
 
 / {
-       model = "Marvell Armada AP806 Quad";
-       compatible = "marvell,armada-ap806-quad", "marvell,armada-ap806";
-
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index 866628679ac7c5b6f216642048d4eeff161b7652..ecfd5f70190b2b2bf23f50f7344f70cd6509af6b 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@ -8,11 +8,6 @@
 #define AP_NAME                ap806
 #include "armada-ap80x.dtsi"
 
-/ {
-       model = "Marvell Armada AP806";
-       compatible = "marvell,armada-ap806";
-};
-
 &ap_syscon0 {
        ap_clk: clock {
                compatible = "marvell,ap806-clock";

diff --git a/arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi b/arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi
index 8848238f9565dc82fe543e233f21c0dc3bfa75c0..e8af7546e893eddce60db98484bdb6a6f2c83836 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi
@@ -8,9 +8,6 @@
 #include "armada-ap807.dtsi"
 
 / {
-       model = "Marvell Armada AP807 Quad";
-       compatible = "marvell,armada-ap807-quad", "marvell,armada-ap807";
-
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
index a3328d05fc94c10968e7d96f22e94375ca89faf6..550bdba7aeb9efb13420ed7601ef99f03faa6312 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
@@ -8,11 +8,6 @@
 #define AP_NAME                ap807
 #include "armada-ap80x.dtsi"
 
-/ {
-       model = "Marvell Armada AP807";
-       compatible = "marvell,armada-ap807";
-};
-
 &ap_syscon0 {
        ap_clk: clock {
                compatible = "marvell,ap807-clock";

diff --git a/arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi b/arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi
index d1a7143ef3d406f691c7e6a7f0a141a00c0cc988..2e719ffc82899ffdd06d9a082a39e66efdf011e3 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi
@@ -11,7 +11,6 @@
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
-               compatible = "marvell,armada-ap810-octa";
 
                cpu0: cpu@0 {
                        device_type = "cpu";

diff --git a/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi b/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi
index 2f9ab6b4a2c9c823d7fa7c3b09d2ab492bd38c3d..f824eb56b0e26d97b73413e080b72f30ca45e5b7 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi
@@ -10,8 +10,6 @@
 /dts-v1/;
 
 / {
-       model = "Marvell Armada AP810";
-       compatible = "marvell,armada-ap810";
        #address-cells = <2>;
        #size-cells = <2>;
 

diff --git a/arch/arm64/boot/dts/marvell/cn9130-sr-som.dtsi b/arch/arm64/boot/dts/marvell/cn9130-sr-som.dtsi
index cb8d54895a77753c760b58b8b5103149e21e2094..a997bbabedd8a9679e9d209225666d7696dd7da2 100644 (file)
--- a/arch/arm64/boot/dts/marvell/cn9130-sr-som.dtsi
+++ b/arch/arm64/boot/dts/marvell/cn9130-sr-som.dtsi
@@ -7,9 +7,6 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
-       model = "SolidRun CN9130 SoM";
-       compatible = "solidrun,cn9130-sr-som", "marvell,cn9130";
-
        aliases {
                ethernet0 = &cp0_eth0;
                ethernet1 = &cp0_eth1;