.../bindings/arm/marvell,berlin.yaml | 45 ++++++++++ .../devicetree/bindings/arm/syna.txt | 89 ------------------- 2 files changed, 45 insertions(+), 89 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/marvell,berlin.yaml delete mode 100644 Documentation/devicetree/bindings/arm/syna.txt
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
.../bindings/arm/marvell,berlin.yaml | 45 ++++++++++
.../devicetree/bindings/arm/syna.txt | 89 -------------------
2 files changed, 45 insertions(+), 89 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/marvell,berlin.yaml
delete mode 100644 Documentation/devicetree/bindings/arm/syna.txt
diff --git a/Documentation/devicetree/bindings/arm/marvell,berlin.yaml b/Documentation/devicetree/bindings/arm/marvell,berlin.yaml
new file mode 100644
index 000000000000..4e8442980dcb
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/marvell,berlin.yaml
@@ -0,0 +1,45 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/marvell,berlin.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Synaptics/Marvell Berlin SoC
+
+maintainers:
+ - Jisheng Zhang <jszhang@kernel.org>
+
+description:
+ According to https://www.synaptics.com/company/news/conexant-marvell
+ Synaptics has acquired the Multimedia Solutions Business of Marvell, so
+ Berlin SoCs are now Synaptics' SoCs.
+
+properties:
+ $nodename:
+ const: '/'
+ compatible:
+ oneOf:
+ - items:
+ - enum:
+ - sony,nsz-gs7
+ - const: marvell,berlin2
+ - const: marvell,berlin
+ - items:
+ - enum:
+ - google,chromecast
+ - valve,steamlink
+ - const: marvell,berlin2cd
+ - const: marvell,berlin
+ - items:
+ - enum:
+ - marvell,berlin2q-dmp
+ - const: marvell,berlin2q
+ - const: marvell,berlin
+ - items:
+ - enum:
+ - marvell,berlin4ct-dmp
+ - marvell,berlin4ct-stb
+ - const: marvell,berlin4ct
+ - const: marvell,berlin
+
+additionalProperties: true
diff --git a/Documentation/devicetree/bindings/arm/syna.txt b/Documentation/devicetree/bindings/arm/syna.txt
deleted file mode 100644
index f53c430f648c..000000000000
--- a/Documentation/devicetree/bindings/arm/syna.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-Synaptics SoC Device Tree Bindings
-
-According to https://www.synaptics.com/company/news/conexant-marvell
-Synaptics has acquired the Multimedia Solutions Business of Marvell, so
-berlin SoCs are now Synaptics' SoCs now.
-
----------------------------------------------------------------
-
-Boards with a SoC of the Marvell Berlin family, e.g. Armada 1500
-shall have the following properties:
-
-* Required root node properties:
-compatible: must contain "marvell,berlin"
-
-In addition, the above compatible shall be extended with the specific
-SoC and board used. Currently known SoC compatibles are:
- "marvell,berlin2" for Marvell Armada 1500 (BG2, 88DE3100),
- "marvell,berlin2cd" for Marvell Armada 1500-mini (BG2CD, 88DE3005)
- "marvell,berlin2ct" for Marvell Armada ? (BG2CT, 88DE????)
- "marvell,berlin2q" for Marvell Armada 1500-pro (BG2Q, 88DE3114)
- "marvell,berlin3" for Marvell Armada ? (BG3, 88DE????)
-
-* Example:
-
-/ {
- model = "Sony NSZ-GS7";
- compatible = "sony,nsz-gs7", "marvell,berlin2", "marvell,berlin";
-
- ...
-}
-
-* Marvell Berlin CPU control bindings
-
-CPU control register allows various operations on CPUs, like resetting them
-independently.
-
-Required properties:
-- compatible: should be "marvell,berlin-cpu-ctrl"
-- reg: address and length of the register set
-
-Example:
-
-cpu-ctrl@f7dd0000 {
- compatible = "marvell,berlin-cpu-ctrl";
- reg = <0xf7dd0000 0x10000>;
-};
-
-* Marvell Berlin2 chip control binding
-
-Marvell Berlin SoCs have a chip control register set providing several
-individual registers dealing with pinmux, padmux, clock, reset, and secondary
-CPU boot address. Unfortunately, the individual registers are spread among the
-chip control registers, so there should be a single DT node only providing the
-different functions which are described below.
-
-Required properties:
-- compatible:
- * the first and second values must be:
- "simple-mfd", "syscon"
-- reg: address and length of following register sets for
- BG2/BG2CD: chip control register set
- BG2Q: chip control register set and cpu pll registers
-
-* Marvell Berlin2 system control binding
-
-Marvell Berlin SoCs have a system control register set providing several
-individual registers dealing with pinmux, padmux, and reset.
-
-Required properties:
-- compatible:
- * the first and second values must be:
- "simple-mfd", "syscon"
-- reg: address and length of the system control register set
-
-Example:
-
-chip: chip-control@ea0000 {
- compatible = "simple-mfd", "syscon";
- reg = <0xea0000 0x400>;
-
- /* sub-device nodes */
-};
-
-sysctrl: system-controller@d000 {
- compatible = "simple-mfd", "syscon";
- reg = <0xd000 0x100>;
-
- /* sub-device nodes */
-};
--
2.47.2
On Wed, 06 Aug 2025 16:27:32 -0500, Rob Herring (Arm) wrote: > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> > --- > .../bindings/arm/marvell,berlin.yaml | 45 ++++++++++ > .../devicetree/bindings/arm/syna.txt | 89 ------------------- > 2 files changed, 45 insertions(+), 89 deletions(-) > create mode 100644 Documentation/devicetree/bindings/arm/marvell,berlin.yaml > delete mode 100644 Documentation/devicetree/bindings/arm/syna.txt > Applied, thanks!
On Wed, Aug 06, 2025 at 04:27:32PM -0500, Rob Herring (Arm) wrote: > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> Reviewed-by: Jisheng Zhang <jszhang@kernel.org> BTW: can you please directly take this patch in dt pr? It's likely no other patches for next window. Thanks > --- > .../bindings/arm/marvell,berlin.yaml | 45 ++++++++++ > .../devicetree/bindings/arm/syna.txt | 89 ------------------- > 2 files changed, 45 insertions(+), 89 deletions(-) > create mode 100644 Documentation/devicetree/bindings/arm/marvell,berlin.yaml > delete mode 100644 Documentation/devicetree/bindings/arm/syna.txt > > diff --git a/Documentation/devicetree/bindings/arm/marvell,berlin.yaml b/Documentation/devicetree/bindings/arm/marvell,berlin.yaml > new file mode 100644 > index 000000000000..4e8442980dcb > --- /dev/null > +++ b/Documentation/devicetree/bindings/arm/marvell,berlin.yaml > @@ -0,0 +1,45 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/arm/marvell,berlin.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Synaptics/Marvell Berlin SoC > + > +maintainers: > + - Jisheng Zhang <jszhang@kernel.org> > + > +description: > + According to https://www.synaptics.com/company/news/conexant-marvell > + Synaptics has acquired the Multimedia Solutions Business of Marvell, so > + Berlin SoCs are now Synaptics' SoCs. > + > +properties: > + $nodename: > + const: '/' > + compatible: > + oneOf: > + - items: > + - enum: > + - sony,nsz-gs7 > + - const: marvell,berlin2 > + - const: marvell,berlin > + - items: > + - enum: > + - google,chromecast > + - valve,steamlink > + - const: marvell,berlin2cd > + - const: marvell,berlin > + - items: > + - enum: > + - marvell,berlin2q-dmp > + - const: marvell,berlin2q > + - const: marvell,berlin > + - items: > + - enum: > + - marvell,berlin4ct-dmp > + - marvell,berlin4ct-stb > + - const: marvell,berlin4ct > + - const: marvell,berlin > + > +additionalProperties: true > diff --git a/Documentation/devicetree/bindings/arm/syna.txt b/Documentation/devicetree/bindings/arm/syna.txt > deleted file mode 100644 > index f53c430f648c..000000000000 > --- a/Documentation/devicetree/bindings/arm/syna.txt > +++ /dev/null > @@ -1,89 +0,0 @@ > -Synaptics SoC Device Tree Bindings > - > -According to https://www.synaptics.com/company/news/conexant-marvell > -Synaptics has acquired the Multimedia Solutions Business of Marvell, so > -berlin SoCs are now Synaptics' SoCs now. > - > ---------------------------------------------------------------- > - > -Boards with a SoC of the Marvell Berlin family, e.g. Armada 1500 > -shall have the following properties: > - > -* Required root node properties: > -compatible: must contain "marvell,berlin" > - > -In addition, the above compatible shall be extended with the specific > -SoC and board used. Currently known SoC compatibles are: > - "marvell,berlin2" for Marvell Armada 1500 (BG2, 88DE3100), > - "marvell,berlin2cd" for Marvell Armada 1500-mini (BG2CD, 88DE3005) > - "marvell,berlin2ct" for Marvell Armada ? (BG2CT, 88DE????) > - "marvell,berlin2q" for Marvell Armada 1500-pro (BG2Q, 88DE3114) > - "marvell,berlin3" for Marvell Armada ? (BG3, 88DE????) > - > -* Example: > - > -/ { > - model = "Sony NSZ-GS7"; > - compatible = "sony,nsz-gs7", "marvell,berlin2", "marvell,berlin"; > - > - ... > -} > - > -* Marvell Berlin CPU control bindings > - > -CPU control register allows various operations on CPUs, like resetting them > -independently. > - > -Required properties: > -- compatible: should be "marvell,berlin-cpu-ctrl" > -- reg: address and length of the register set > - > -Example: > - > -cpu-ctrl@f7dd0000 { > - compatible = "marvell,berlin-cpu-ctrl"; > - reg = <0xf7dd0000 0x10000>; > -}; > - > -* Marvell Berlin2 chip control binding > - > -Marvell Berlin SoCs have a chip control register set providing several > -individual registers dealing with pinmux, padmux, clock, reset, and secondary > -CPU boot address. Unfortunately, the individual registers are spread among the > -chip control registers, so there should be a single DT node only providing the > -different functions which are described below. > - > -Required properties: > -- compatible: > - * the first and second values must be: > - "simple-mfd", "syscon" > -- reg: address and length of following register sets for > - BG2/BG2CD: chip control register set > - BG2Q: chip control register set and cpu pll registers > - > -* Marvell Berlin2 system control binding > - > -Marvell Berlin SoCs have a system control register set providing several > -individual registers dealing with pinmux, padmux, and reset. > - > -Required properties: > -- compatible: > - * the first and second values must be: > - "simple-mfd", "syscon" > -- reg: address and length of the system control register set > - > -Example: > - > -chip: chip-control@ea0000 { > - compatible = "simple-mfd", "syscon"; > - reg = <0xea0000 0x400>; > - > - /* sub-device nodes */ > -}; > - > -sysctrl: system-controller@d000 { > - compatible = "simple-mfd", "syscon"; > - reg = <0xd000 0x100>; > - > - /* sub-device nodes */ > -}; > -- > 2.47.2 >
© 2016 - 2025 Red Hat, Inc.