* [PATCH 1/6] dt-bindings: marvell: armada-37xx: Add glinet,gl-mv1000 compatible
2025-01-31 21:08 [PATCH 0/6] marvell: DT root compatible fixes Rob Herring (Arm)
@ 2025-01-31 21:08 ` Rob Herring (Arm)
2025-01-31 21:08 ` [PATCH 2/6] dt-bindings: marvell: armada-7k-8k: Move Armada 8KPlus to schema Rob Herring (Arm)
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Rob Herring (Arm) @ 2025-01-31 21:08 UTC (permalink / raw)
To: Andrew Lunn, Gregory Clement, Sebastian Hesselbarth,
Krzysztof Kozlowski, Conor Dooley, Robert Marko
Cc: linux-arm-kernel, devicetree, linux-kernel
"glinet,gl-mv1000" is already in use, so add it to documentation.
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
Documentation/devicetree/bindings/arm/marvell/armada-37xx.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-37xx.yaml b/Documentation/devicetree/bindings/arm/marvell/armada-37xx.yaml
index 6905d29f3108..51e1386f0e01 100644
--- a/Documentation/devicetree/bindings/arm/marvell/armada-37xx.yaml
+++ b/Documentation/devicetree/bindings/arm/marvell/armada-37xx.yaml
@@ -18,6 +18,7 @@ properties:
items:
- enum:
- cznic,turris-mox
+ - glinet,gl-mv1000
- globalscale,espressobin
- marvell,armada-3720-db
- methode,edpu
--
2.47.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/6] dt-bindings: marvell: armada-7k-8k: Move Armada 8KPlus to schema
2025-01-31 21:08 [PATCH 0/6] marvell: DT root compatible fixes Rob Herring (Arm)
2025-01-31 21:08 ` [PATCH 1/6] dt-bindings: marvell: armada-37xx: Add glinet,gl-mv1000 compatible Rob Herring (Arm)
@ 2025-01-31 21:08 ` Rob Herring (Arm)
2025-01-31 21:08 ` [PATCH 3/6] dt-bindings: marvell: armada-7k-8k: Add missing 7040 and 8040 board compatibles Rob Herring (Arm)
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Rob Herring (Arm) @ 2025-01-31 21:08 UTC (permalink / raw)
To: Andrew Lunn, Gregory Clement, Sebastian Hesselbarth,
Krzysztof Kozlowski, Conor Dooley, Robert Marko
Cc: linux-arm-kernel, devicetree, linux-kernel
Move the text binding for the Armada 8KPlus to the existing DT schema
for Marvell 7k and 8k SoCs.
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
.../devicetree/bindings/arm/marvell/armada-7k-8k.yaml | 8 ++++++++
.../devicetree/bindings/arm/marvell/armada-8kp.txt | 15 ---------------
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml b/Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml
index 538d91be8857..f1a7e6576306 100644
--- a/Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml
+++ b/Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml
@@ -39,6 +39,14 @@ properties:
- const: marvell,armada-ap806-quad
- const: marvell,armada-ap806
+ - description: Armada 8080 SoC
+ items:
+ - enum:
+ - marvell,armada-8080-db
+ - const: marvell,armada-8080
+ - const: marvell,armada-ap810-octa
+ - const: marvell,armada-ap810
+
- description: Armada CN9130 SoC with no external CP
items:
- const: marvell,cn9130
diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-8kp.txt b/Documentation/devicetree/bindings/arm/marvell/armada-8kp.txt
deleted file mode 100644
index f3e9624534c6..000000000000
--- a/Documentation/devicetree/bindings/arm/marvell/armada-8kp.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Marvell Armada 8KPlus Platforms Device Tree Bindings
-----------------------------------------------------
-
-Boards using a SoC of the Marvell Armada 8KP families must carry
-the following root node property:
-
- - compatible, with one of the following values:
-
- - "marvell,armada-8080", "marvell,armada-ap810-octa", "marvell,armada-ap810"
- when the SoC being used is the Armada 8080
-
-Example:
-
-compatible = "marvell,armada-8080-db", "marvell,armada-8080",
- "marvell,armada-ap810-octa", "marvell,armada-ap810"
--
2.47.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/6] dt-bindings: marvell: armada-7k-8k: Add missing 7040 and 8040 board compatibles
2025-01-31 21:08 [PATCH 0/6] marvell: DT root compatible fixes Rob Herring (Arm)
2025-01-31 21:08 ` [PATCH 1/6] dt-bindings: marvell: armada-37xx: Add glinet,gl-mv1000 compatible Rob Herring (Arm)
2025-01-31 21:08 ` [PATCH 2/6] dt-bindings: marvell: armada-7k-8k: Move Armada 8KPlus to schema Rob Herring (Arm)
@ 2025-01-31 21:08 ` Rob Herring (Arm)
2025-01-31 21:08 ` [PATCH 4/6] arm64: dts: marvell: Drop incomplete root compatible/model properties Rob Herring (Arm)
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Rob Herring (Arm) @ 2025-01-31 21:08 UTC (permalink / raw)
To: Andrew Lunn, Gregory Clement, Sebastian Hesselbarth,
Krzysztof Kozlowski, Conor Dooley, Robert Marko
Cc: linux-arm-kernel, devicetree, linux-kernel
There's a number of board compatibles already in use, but not
documented. Add them to the schema. These are added to the existing
entries which are missing any board specific compatible. Entries with
only SoC compatibles should not have been allowed in the first place.
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
.../devicetree/bindings/arm/marvell/armada-7k-8k.yaml | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml b/Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml
index f1a7e6576306..4bc7454a5d3a 100644
--- a/Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml
+++ b/Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml
@@ -23,6 +23,9 @@ properties:
- description: Armada 7040 SoC
items:
+ - enum:
+ - globalscale,mochabin
+ - marvell,armada7040-db
- const: marvell,armada7040
- const: marvell,armada-ap806-quad
- const: marvell,armada-ap806
@@ -35,6 +38,20 @@ properties:
- description: Armada 8040 SoC
items:
+ - enum:
+ - iei,puzzle-m801
+ - marvell,armada8040-db
+ - solidrun,clearfog-gt-8k
+ - const: marvell,armada8040
+ - const: marvell,armada-ap806-quad
+ - const: marvell,armada-ap806
+
+ - description: Armada 8040 SoC MACCHIATOBin Boards
+ items:
+ - enum:
+ - marvell,armada8040-mcbin-doubleshot
+ - marvell,armada8040-mcbin-singleshot
+ - const: marvell,armada8040-mcbin
- const: marvell,armada8040
- const: marvell,armada-ap806-quad
- const: marvell,armada-ap806
--
2.47.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/6] arm64: dts: marvell: Drop incomplete root compatible/model properties
2025-01-31 21:08 [PATCH 0/6] marvell: DT root compatible fixes Rob Herring (Arm)
` (2 preceding siblings ...)
2025-01-31 21:08 ` [PATCH 3/6] dt-bindings: marvell: armada-7k-8k: Add missing 7040 and 8040 board compatibles Rob Herring (Arm)
@ 2025-01-31 21:08 ` Rob Herring (Arm)
2025-01-31 21:08 ` [PATCH 5/6] arm64: dts: marvell: Fix missing/incorrect "marvell,armada3710" compatible Rob Herring (Arm)
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Rob Herring (Arm) @ 2025-01-31 21:08 UTC (permalink / raw)
To: Andrew Lunn, Gregory Clement, Sebastian Hesselbarth,
Krzysztof Kozlowski, Conor Dooley, Robert Marko
Cc: linux-arm-kernel, devicetree, linux-kernel
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>
---
arch/arm64/boot/dts/marvell/armada-371x.dtsi | 17 -----------------
arch/arm64/boot/dts/marvell/armada-372x.dtsi | 3 ---
arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 --
arch/arm64/boot/dts/marvell/armada-7020.dtsi | 6 ------
arch/arm64/boot/dts/marvell/armada-7040.dtsi | 6 ------
arch/arm64/boot/dts/marvell/armada-8020.dtsi | 6 ------
arch/arm64/boot/dts/marvell/armada-8040.dtsi | 6 ------
arch/arm64/boot/dts/marvell/armada-8080.dtsi | 6 ------
arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 3 ---
arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 3 ---
arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 5 -----
arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi | 3 ---
arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 5 -----
.../boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi | 1 -
arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi | 2 --
arch/arm64/boot/dts/marvell/cn9130-sr-som.dtsi | 3 ---
16 files changed, 77 deletions(-)
diff --git a/arch/arm64/boot/dts/marvell/armada-371x.dtsi b/arch/arm64/boot/dts/marvell/armada-371x.dtsi
deleted file mode 100644
index dc1182ec9fa1..000000000000
--- 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 02ae1e153288..b99ac4c03a48 100644
--- 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 9603223dd761..4e5ff7f67e33 100644
--- 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 4e46326dd123..570f901b4f4a 100644
--- 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 2f440711d21d..710ac44870bd 100644
--- 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 ba1307c0fadb..b6fc18876093 100644
--- 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 22c2d6ebf381..3efd9b9e6892 100644
--- 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 299e814d1ded..32bb56f2fe3f 100644
--- 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 3ed6fba1f438..82f4dedfc25e 100644
--- 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 cf6a96ddcf40..f37f49c79a50 100644
--- 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 866628679ac7..ecfd5f70190b 100644
--- 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 8848238f9565..e8af7546e893 100644
--- 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 a3328d05fc94..550bdba7aeb9 100644
--- 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 d1a7143ef3d4..2e719ffc8289 100644
--- 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 2f9ab6b4a2c9..f824eb56b0e2 100644
--- 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 cb8d54895a77..a997bbabedd8 100644
--- 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;
--
2.47.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/6] arm64: dts: marvell: Fix missing/incorrect "marvell,armada3710" compatible
2025-01-31 21:08 [PATCH 0/6] marvell: DT root compatible fixes Rob Herring (Arm)
` (3 preceding siblings ...)
2025-01-31 21:08 ` [PATCH 4/6] arm64: dts: marvell: Drop incomplete root compatible/model properties Rob Herring (Arm)
@ 2025-01-31 21:08 ` Rob Herring (Arm)
2025-01-31 21:08 ` [PATCH 6/6] arm64: dts: marvell: Add missing board compatible for IEI-Puzzle-M801 Rob Herring (Arm)
2025-02-04 19:46 ` [PATCH 0/6] marvell: DT root compatible fixes Conor Dooley
6 siblings, 0 replies; 9+ messages in thread
From: Rob Herring (Arm) @ 2025-01-31 21:08 UTC (permalink / raw)
To: Andrew Lunn, Gregory Clement, Sebastian Hesselbarth,
Krzysztof Kozlowski, Conor Dooley, Robert Marko
Cc: linux-arm-kernel, devicetree, linux-kernel
"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>
---
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-gl-mv1000.dts | 2 +-
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
index 0cfb38492021..bd4e61d5448e 100644
--- 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 6715a19c1483..5c4d8f379704 100644
--- 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 b3cc2b7b5d19..97a180c8dcd9 100644
--- 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 2a8aa3901a9f..75401eab4d42 100644
--- 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 b03af87611a9..48a7f50fb427 100644
--- 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 c5a834b33b77..1542d836c090 100644
--- 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 56930f2ce481..9f4bafeddd82 100644
--- 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 54453b0a91f9..f4d73c8b1a6d 100644
--- 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;
--
2.47.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 6/6] arm64: dts: marvell: Add missing board compatible for IEI-Puzzle-M801
2025-01-31 21:08 [PATCH 0/6] marvell: DT root compatible fixes Rob Herring (Arm)
` (4 preceding siblings ...)
2025-01-31 21:08 ` [PATCH 5/6] arm64: dts: marvell: Fix missing/incorrect "marvell,armada3710" compatible Rob Herring (Arm)
@ 2025-01-31 21:08 ` Rob Herring (Arm)
2025-02-04 19:46 ` [PATCH 0/6] marvell: DT root compatible fixes Conor Dooley
6 siblings, 0 replies; 9+ messages in thread
From: Rob Herring (Arm) @ 2025-01-31 21:08 UTC (permalink / raw)
To: Andrew Lunn, Gregory Clement, Sebastian Hesselbarth,
Krzysztof Kozlowski, Conor Dooley, Robert Marko
Cc: linux-arm-kernel, devicetree, linux-kernel
The IEI-Puzzle-M801 board is missing a board compatible, so add one.
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts b/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
index 9c25a88581e4..def25d51c4bf 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
@@ -13,7 +13,7 @@
/ {
model = "IEI-Puzzle-M801";
- compatible = "marvell,armada8040", "marvell,armada-ap806-quad", "marvell,armada-ap806";
+ compatible = "iei,puzzle-m801", "marvell,armada8040", "marvell,armada-ap806-quad", "marvell,armada-ap806";
aliases {
ethernet0 = &cp0_eth0;
--
2.47.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 0/6] marvell: DT root compatible fixes
2025-01-31 21:08 [PATCH 0/6] marvell: DT root compatible fixes Rob Herring (Arm)
` (5 preceding siblings ...)
2025-01-31 21:08 ` [PATCH 6/6] arm64: dts: marvell: Add missing board compatible for IEI-Puzzle-M801 Rob Herring (Arm)
@ 2025-02-04 19:46 ` Conor Dooley
2025-02-12 10:50 ` Gregory CLEMENT
6 siblings, 1 reply; 9+ messages in thread
From: Conor Dooley @ 2025-02-04 19:46 UTC (permalink / raw)
To: Rob Herring (Arm)
Cc: Andrew Lunn, Gregory Clement, Sebastian Hesselbarth,
Krzysztof Kozlowski, Conor Dooley, Robert Marko, linux-arm-kernel,
devicetree, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 308 bytes --]
On Fri, Jan 31, 2025 at 03:08:24PM -0600, Rob Herring (Arm) wrote:
> This series adds some missing root node compatibles and fixes some
> errors in dts files for the root node compatibles.
>
> Signed-off-by: "Rob Herring (Arm)" <robh@kernel.org>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 0/6] marvell: DT root compatible fixes
2025-02-04 19:46 ` [PATCH 0/6] marvell: DT root compatible fixes Conor Dooley
@ 2025-02-12 10:50 ` Gregory CLEMENT
0 siblings, 0 replies; 9+ messages in thread
From: Gregory CLEMENT @ 2025-02-12 10:50 UTC (permalink / raw)
To: Conor Dooley, Rob Herring (Arm)
Cc: Andrew Lunn, Sebastian Hesselbarth, Krzysztof Kozlowski,
Conor Dooley, Robert Marko, linux-arm-kernel, devicetree,
linux-kernel
Conor Dooley <conor@kernel.org> writes:
> On Fri, Jan 31, 2025 at 03:08:24PM -0600, Rob Herring (Arm) wrote:
>> This series adds some missing root node compatibles and fixes some
>> errors in dts files for the root node compatibles.
>>
>> Signed-off-by: "Rob Herring (Arm)" <robh@kernel.org>
>
> Acked-by: Conor Dooley <conor.dooley@microchip.com>
Applied on mvebu/dt64
Thanks,
Gregory
--
Grégory CLEMENT, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 9+ messages in thread