.../bindings/arm/marvell/98dx3236.txt | 23 ------ .../bindings/arm/marvell/armada-370-xp.txt | 24 ------ .../arm/marvell/marvell,armada-370-xp.yaml | 78 +++++++++++++++++++ 3 files changed, 78 insertions(+), 47 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/marvell/98dx3236.txt delete mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-370-xp.txt create mode 100644 Documentation/devicetree/bindings/arm/marvell/marvell,armada-370-xp.yaml
Convert Marvell Armada 370/XP based boards to DT schema format.
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
.../bindings/arm/marvell/98dx3236.txt | 23 ------
.../bindings/arm/marvell/armada-370-xp.txt | 24 ------
.../arm/marvell/marvell,armada-370-xp.yaml | 78 +++++++++++++++++++
3 files changed, 78 insertions(+), 47 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/marvell/98dx3236.txt
delete mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-370-xp.txt
create mode 100644 Documentation/devicetree/bindings/arm/marvell/marvell,armada-370-xp.yaml
diff --git a/Documentation/devicetree/bindings/arm/marvell/98dx3236.txt b/Documentation/devicetree/bindings/arm/marvell/98dx3236.txt
deleted file mode 100644
index 64e8c73fc5ab..000000000000
--- a/Documentation/devicetree/bindings/arm/marvell/98dx3236.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Marvell 98DX3236, 98DX3336 and 98DX4251 Platforms Device Tree Bindings
-----------------------------------------------------------------------
-
-Boards with a SoC of the Marvell 98DX3236, 98DX3336 and 98DX4251 families
-shall have the following property:
-
-Required root node property:
-
-compatible: must contain "marvell,armadaxp-98dx3236"
-
-In addition, boards using the Marvell 98DX3336 SoC shall have the
-following property:
-
-Required root node property:
-
-compatible: must contain "marvell,armadaxp-98dx3336"
-
-In addition, boards using the Marvell 98DX4251 SoC shall have the
-following property:
-
-Required root node property:
-
-compatible: must contain "marvell,armadaxp-98dx4251"
diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-370-xp.txt b/Documentation/devicetree/bindings/arm/marvell/armada-370-xp.txt
deleted file mode 100644
index c6ed90ea6e17..000000000000
--- a/Documentation/devicetree/bindings/arm/marvell/armada-370-xp.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Marvell Armada 370 and Armada XP Platforms Device Tree Bindings
----------------------------------------------------------------
-
-Boards with a SoC of the Marvell Armada 370 and Armada XP families
-shall have the following property:
-
-Required root node property:
-
-compatible: must contain "marvell,armada-370-xp"
-
-In addition, boards using the Marvell Armada 370 SoC shall have the
-following property:
-
-Required root node property:
-
-compatible: must contain "marvell,armada370"
-
-In addition, boards using the Marvell Armada XP SoC shall have the
-following property:
-
-Required root node property:
-
-compatible: must contain "marvell,armadaxp"
-
diff --git a/Documentation/devicetree/bindings/arm/marvell/marvell,armada-370-xp.yaml b/Documentation/devicetree/bindings/arm/marvell/marvell,armada-370-xp.yaml
new file mode 100644
index 000000000000..e65eadfbd097
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/marvell/marvell,armada-370-xp.yaml
@@ -0,0 +1,78 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+---
+$id: http://devicetree.org/schemas/arm/marvell/marvell,armada-370-xp.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Marvell Armada 370 and Armada XP platforms
+
+maintainers:
+ - Andrew Lunn <andrew@lunn.ch>
+ - Gregory Clement <gregory.clement@bootlin.com>
+
+properties:
+ $nodename:
+ const: '/'
+ compatible:
+ oneOf:
+ - items:
+ - enum:
+ - ctera,c200-v2
+ - dlink,dns327l
+ - globalscale,mirabox
+ - netgear,readynas-102
+ - netgear,readynas-104
+ - marvell,a370-db
+ - marvell,a370-rd
+ - seagate,dart-2
+ - seagate,dart-4
+ - seagate,cumulus-max
+ - seagate,cumulus
+ - synology,ds213j
+ - const: marvell,armada370
+ - const: marvell,armada-370-xp
+
+ - items:
+ - enum:
+ - mikrotik,crs305-1g-4s
+ - mikrotik,crs326-24g-2s
+ - mikrotik,crs328-4c-20s-4s
+ - const: marvell,armadaxp-98dx3236
+ - const: marvell,armada-370-xp
+
+ - items:
+ - const: marvell,db-xc3-24g4xg
+ - const: marvell,armadaxp-98dx3336
+ - const: marvell,armada-370-xp
+
+ - items:
+ - const: marvell,db-dxbc2
+ - const: marvell,armadaxp-98dx4251
+ - const: marvell,armada-370-xp
+
+ - items:
+ - enum:
+ - lenovo,ix4-300d
+ - linksys,mamba
+ - marvell,rd-axpwifiap
+ - netgear,readynas-2120
+ - synology,ds414
+ - const: marvell,armadaxp-mv78230
+ - const: marvell,armadaxp
+ - const: marvell,armada-370-xp
+
+ - items:
+ - const: plathome,openblocks-ax3-4
+ - const: marvell,armadaxp-mv78260
+ - const: marvell,armadaxp
+ - const: marvell,armada-370-xp
+
+ - items:
+ - enum:
+ - marvell,axp-db
+ - marvell,axp-gp
+ - marvell,axp-matrix
+ - const: marvell,armadaxp-mv78460
+ - const: marvell,armadaxp
+ - const: marvell,armada-370-xp
+
+additionalProperties: true
--
2.47.2"Rob Herring (Arm)" <robh@kernel.org> writes: > Convert Marvell Armada 370/XP based boards to DT schema format. > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> Acked-by: Gregory CLEMENT <gregory.clement@bootlin.com> Thanks, Gregory > --- > .../bindings/arm/marvell/98dx3236.txt | 23 ------ > .../bindings/arm/marvell/armada-370-xp.txt | 24 ------ > .../arm/marvell/marvell,armada-370-xp.yaml | 78 +++++++++++++++++++ > 3 files changed, 78 insertions(+), 47 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/arm/marvell/98dx3236.txt > delete mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-370-xp.txt > create mode 100644 Documentation/devicetree/bindings/arm/marvell/marvell,armada-370-xp.yaml > > diff --git a/Documentation/devicetree/bindings/arm/marvell/98dx3236.txt b/Documentation/devicetree/bindings/arm/marvell/98dx3236.txt > deleted file mode 100644 > index 64e8c73fc5ab..000000000000 > --- a/Documentation/devicetree/bindings/arm/marvell/98dx3236.txt > +++ /dev/null > @@ -1,23 +0,0 @@ > -Marvell 98DX3236, 98DX3336 and 98DX4251 Platforms Device Tree Bindings > ----------------------------------------------------------------------- > - > -Boards with a SoC of the Marvell 98DX3236, 98DX3336 and 98DX4251 families > -shall have the following property: > - > -Required root node property: > - > -compatible: must contain "marvell,armadaxp-98dx3236" > - > -In addition, boards using the Marvell 98DX3336 SoC shall have the > -following property: > - > -Required root node property: > - > -compatible: must contain "marvell,armadaxp-98dx3336" > - > -In addition, boards using the Marvell 98DX4251 SoC shall have the > -following property: > - > -Required root node property: > - > -compatible: must contain "marvell,armadaxp-98dx4251" > diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-370-xp.txt b/Documentation/devicetree/bindings/arm/marvell/armada-370-xp.txt > deleted file mode 100644 > index c6ed90ea6e17..000000000000 > --- a/Documentation/devicetree/bindings/arm/marvell/armada-370-xp.txt > +++ /dev/null > @@ -1,24 +0,0 @@ > -Marvell Armada 370 and Armada XP Platforms Device Tree Bindings > ---------------------------------------------------------------- > - > -Boards with a SoC of the Marvell Armada 370 and Armada XP families > -shall have the following property: > - > -Required root node property: > - > -compatible: must contain "marvell,armada-370-xp" > - > -In addition, boards using the Marvell Armada 370 SoC shall have the > -following property: > - > -Required root node property: > - > -compatible: must contain "marvell,armada370" > - > -In addition, boards using the Marvell Armada XP SoC shall have the > -following property: > - > -Required root node property: > - > -compatible: must contain "marvell,armadaxp" > - > diff --git a/Documentation/devicetree/bindings/arm/marvell/marvell,armada-370-xp.yaml b/Documentation/devicetree/bindings/arm/marvell/marvell,armada-370-xp.yaml > new file mode 100644 > index 000000000000..e65eadfbd097 > --- /dev/null > +++ b/Documentation/devicetree/bindings/arm/marvell/marvell,armada-370-xp.yaml > @@ -0,0 +1,78 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +--- > +$id: http://devicetree.org/schemas/arm/marvell/marvell,armada-370-xp.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Marvell Armada 370 and Armada XP platforms > + > +maintainers: > + - Andrew Lunn <andrew@lunn.ch> > + - Gregory Clement <gregory.clement@bootlin.com> > + > +properties: > + $nodename: > + const: '/' > + compatible: > + oneOf: > + - items: > + - enum: > + - ctera,c200-v2 > + - dlink,dns327l > + - globalscale,mirabox > + - netgear,readynas-102 > + - netgear,readynas-104 > + - marvell,a370-db > + - marvell,a370-rd > + - seagate,dart-2 > + - seagate,dart-4 > + - seagate,cumulus-max > + - seagate,cumulus > + - synology,ds213j > + - const: marvell,armada370 > + - const: marvell,armada-370-xp > + > + - items: > + - enum: > + - mikrotik,crs305-1g-4s > + - mikrotik,crs326-24g-2s > + - mikrotik,crs328-4c-20s-4s > + - const: marvell,armadaxp-98dx3236 > + - const: marvell,armada-370-xp > + > + - items: > + - const: marvell,db-xc3-24g4xg > + - const: marvell,armadaxp-98dx3336 > + - const: marvell,armada-370-xp > + > + - items: > + - const: marvell,db-dxbc2 > + - const: marvell,armadaxp-98dx4251 > + - const: marvell,armada-370-xp > + > + - items: > + - enum: > + - lenovo,ix4-300d > + - linksys,mamba > + - marvell,rd-axpwifiap > + - netgear,readynas-2120 > + - synology,ds414 > + - const: marvell,armadaxp-mv78230 > + - const: marvell,armadaxp > + - const: marvell,armada-370-xp > + > + - items: > + - const: plathome,openblocks-ax3-4 > + - const: marvell,armadaxp-mv78260 > + - const: marvell,armadaxp > + - const: marvell,armada-370-xp > + > + - items: > + - enum: > + - marvell,axp-db > + - marvell,axp-gp > + - marvell,axp-matrix > + - const: marvell,armadaxp-mv78460 > + - const: marvell,armadaxp > + - const: marvell,armada-370-xp > + > +additionalProperties: true > -- > 2.47.2 > -- Grégory CLEMENT, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
On Fri, Sep 12, 2025 at 7:44 AM Gregory CLEMENT <gregory.clement@bootlin.com> wrote: > > "Rob Herring (Arm)" <robh@kernel.org> writes: > > > Convert Marvell Armada 370/XP based boards to DT schema format. > > > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> > > > Acked-by: Gregory CLEMENT <gregory.clement@bootlin.com> This (and the other conversions) should be applied to the Marvell tree. Rob
On Tue, Aug 5, 2025 at 6:25 PM Rob Herring (Arm) <robh@kernel.org> wrote: > > Convert Marvell Armada 370/XP based boards to DT schema format. > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> > --- > .../bindings/arm/marvell/98dx3236.txt | 23 ------ > .../bindings/arm/marvell/armada-370-xp.txt | 24 ------ > .../arm/marvell/marvell,armada-370-xp.yaml | 78 +++++++++++++++++++ > 3 files changed, 78 insertions(+), 47 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/arm/marvell/98dx3236.txt > delete mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-370-xp.txt > create mode 100644 Documentation/devicetree/bindings/arm/marvell/marvell,armada-370-xp.yaml Ping on this and the 5 other board conversions. > > diff --git a/Documentation/devicetree/bindings/arm/marvell/98dx3236.txt b/Documentation/devicetree/bindings/arm/marvell/98dx3236.txt > deleted file mode 100644 > index 64e8c73fc5ab..000000000000 > --- a/Documentation/devicetree/bindings/arm/marvell/98dx3236.txt > +++ /dev/null > @@ -1,23 +0,0 @@ > -Marvell 98DX3236, 98DX3336 and 98DX4251 Platforms Device Tree Bindings > ----------------------------------------------------------------------- > - > -Boards with a SoC of the Marvell 98DX3236, 98DX3336 and 98DX4251 families > -shall have the following property: > - > -Required root node property: > - > -compatible: must contain "marvell,armadaxp-98dx3236" > - > -In addition, boards using the Marvell 98DX3336 SoC shall have the > -following property: > - > -Required root node property: > - > -compatible: must contain "marvell,armadaxp-98dx3336" > - > -In addition, boards using the Marvell 98DX4251 SoC shall have the > -following property: > - > -Required root node property: > - > -compatible: must contain "marvell,armadaxp-98dx4251" > diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-370-xp.txt b/Documentation/devicetree/bindings/arm/marvell/armada-370-xp.txt > deleted file mode 100644 > index c6ed90ea6e17..000000000000 > --- a/Documentation/devicetree/bindings/arm/marvell/armada-370-xp.txt > +++ /dev/null > @@ -1,24 +0,0 @@ > -Marvell Armada 370 and Armada XP Platforms Device Tree Bindings > ---------------------------------------------------------------- > - > -Boards with a SoC of the Marvell Armada 370 and Armada XP families > -shall have the following property: > - > -Required root node property: > - > -compatible: must contain "marvell,armada-370-xp" > - > -In addition, boards using the Marvell Armada 370 SoC shall have the > -following property: > - > -Required root node property: > - > -compatible: must contain "marvell,armada370" > - > -In addition, boards using the Marvell Armada XP SoC shall have the > -following property: > - > -Required root node property: > - > -compatible: must contain "marvell,armadaxp" > - > diff --git a/Documentation/devicetree/bindings/arm/marvell/marvell,armada-370-xp.yaml b/Documentation/devicetree/bindings/arm/marvell/marvell,armada-370-xp.yaml > new file mode 100644 > index 000000000000..e65eadfbd097 > --- /dev/null > +++ b/Documentation/devicetree/bindings/arm/marvell/marvell,armada-370-xp.yaml > @@ -0,0 +1,78 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +--- > +$id: http://devicetree.org/schemas/arm/marvell/marvell,armada-370-xp.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Marvell Armada 370 and Armada XP platforms > + > +maintainers: > + - Andrew Lunn <andrew@lunn.ch> > + - Gregory Clement <gregory.clement@bootlin.com> > + > +properties: > + $nodename: > + const: '/' > + compatible: > + oneOf: > + - items: > + - enum: > + - ctera,c200-v2 > + - dlink,dns327l > + - globalscale,mirabox > + - netgear,readynas-102 > + - netgear,readynas-104 > + - marvell,a370-db > + - marvell,a370-rd > + - seagate,dart-2 > + - seagate,dart-4 > + - seagate,cumulus-max > + - seagate,cumulus > + - synology,ds213j > + - const: marvell,armada370 > + - const: marvell,armada-370-xp > + > + - items: > + - enum: > + - mikrotik,crs305-1g-4s > + - mikrotik,crs326-24g-2s > + - mikrotik,crs328-4c-20s-4s > + - const: marvell,armadaxp-98dx3236 > + - const: marvell,armada-370-xp > + > + - items: > + - const: marvell,db-xc3-24g4xg > + - const: marvell,armadaxp-98dx3336 > + - const: marvell,armada-370-xp > + > + - items: > + - const: marvell,db-dxbc2 > + - const: marvell,armadaxp-98dx4251 > + - const: marvell,armada-370-xp > + > + - items: > + - enum: > + - lenovo,ix4-300d > + - linksys,mamba > + - marvell,rd-axpwifiap > + - netgear,readynas-2120 > + - synology,ds414 > + - const: marvell,armadaxp-mv78230 > + - const: marvell,armadaxp > + - const: marvell,armada-370-xp > + > + - items: > + - const: plathome,openblocks-ax3-4 > + - const: marvell,armadaxp-mv78260 > + - const: marvell,armadaxp > + - const: marvell,armada-370-xp > + > + - items: > + - enum: > + - marvell,axp-db > + - marvell,axp-gp > + - marvell,axp-matrix > + - const: marvell,armadaxp-mv78460 > + - const: marvell,armadaxp > + - const: marvell,armada-370-xp > + > +additionalProperties: true > -- > 2.47.2 >
© 2016 - 2025 Red Hat, Inc.