[PATCH] dt-bindings: memory: convert Broadcom DPFE to dtschema

[PATCH] dt-bindings: memory: convert Broadcom DPFE to dtschema

[Krzysztof Kozlowski]

Convert Broadcom DDR PHY Front End (DPFE) bindings to DT schema format
using json-schema.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
 .../memory-controllers/brcm,dpfe-cpu.txt      | 27 -----------
 .../memory-controllers/brcm,dpfe-cpu.yaml     | 48 +++++++++++++++++++
 MAINTAINERS                                   |  2 +-
 3 files changed, 49 insertions(+), 28 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt
 create mode 100644 Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.yaml

diff --git a/Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt b/Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt
deleted file mode 100644
index 82d923ef413f..000000000000
--- a/Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-DDR PHY Front End (DPFE) for Broadcom STB
-=========================================
-
-DPFE and the DPFE firmware provide an interface for the host CPU to
-communicate with the DCPU, which resides inside the DDR PHY.
-
-There are three memory regions for interacting with the DCPU. These are
-specified in a single reg property.
-
-Required properties:
-  - compatible: must be "brcm,bcm7271-dpfe-cpu", "brcm,bcm7268-dpfe-cpu"
-    or "brcm,dpfe-cpu"
-  - reg: must reference three register ranges
-      - start address and length of the DCPU register space
-      - start address and length of the DCPU data memory space
-      - start address and length of the DCPU instruction memory space
-  - reg-names: must contain "dpfe-cpu", "dpfe-dmem", and "dpfe-imem";
-        they must be in the same order as the register declarations
-
-Example:
-	dpfe_cpu0: dpfe-cpu@f1132000 {
-		compatible = "brcm,bcm7271-dpfe-cpu", "brcm,dpfe-cpu";
-		reg =  <0xf1132000 0x180
-			0xf1134000 0x1000
-			0xf1138000 0x4000>;
-		reg-names = "dpfe-cpu", "dpfe-dmem", "dpfe-imem";
-	};
diff --git a/Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.yaml b/Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.yaml
new file mode 100644
index 000000000000..769f13250047
--- /dev/null
+++ b/Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.yaml
@@ -0,0 +1,48 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/memory-controllers/brcm,dpfe-cpu.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: DDR PHY Front End (DPFE) for Broadcom STB
+
+maintainers:
+  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+  - Markus Mayer <mmayer@broadcom.com>
+
+properties:
+  compatible:
+    items:
+      - enum:
+          - brcm,bcm7271-dpfe-cpu
+          - brcm,bcm7268-dpfe-cpu
+      - const: brcm,dpfe-cpu
+
+  reg:
+    items:
+      - description: DCPU register space
+      - description: DCPU data memory space
+      - description: DCPU instruction memory space
+
+  reg-names:
+    items:
+      - const: dpfe-cpu
+      - const: dpfe-dmem
+      - const: dpfe-imem
+
+required:
+  - compatible
+  - reg
+  - reg-names
+
+additionalProperties: false
+
+examples:
+  - |
+    dpfe-cpu@f1132000 {
+        compatible = "brcm,bcm7271-dpfe-cpu", "brcm,dpfe-cpu";
+        reg = <0xf1132000 0x180>,
+              <0xf1134000 0x1000>,
+              <0xf1138000 0x4000>;
+        reg-names = "dpfe-cpu", "dpfe-dmem", "dpfe-imem";
+    };
diff --git a/MAINTAINERS b/MAINTAINERS
index 36aee8517ab0..be8e4af8ed64 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3855,7 +3855,7 @@ M:	Markus Mayer <mmayer@broadcom.com>
 M:	bcm-kernel-feedback-list@broadcom.com
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:	Maintained
-F:	Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt
+F:	Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.yaml
 F:	drivers/memory/brcmstb_dpfe.c
 
 BROADCOM STB NAND FLASH DRIVER
-- 
2.30.2

Re: [PATCH] dt-bindings: memory: convert Broadcom DPFE to dtschema

[Markus Mayer]

Thanks for updating this.

> +++ b/Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.yaml
> @@ -0,0 +1,48 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/memory-controllers/brcm,dpfe-cpu.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: DDR PHY Front End (DPFE) for Broadcom STB
> +
> +maintainers:
> +  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> +  - Markus Mayer <mmayer@broadcom.com>
> +
> +properties:
> +  compatible:
> +    items:
> +      - enum:
> +          - brcm,bcm7271-dpfe-cpu
> +          - brcm,bcm7268-dpfe-cpu
> +      - const: brcm,dpfe-cpu
> +
> +  reg:
> +    items:
> +      - description: DCPU register space
> +      - description: DCPU data memory space
> +      - description: DCPU instruction memory space
> +
> +  reg-names:
> +    items:
> +      - const: dpfe-cpu
> +      - const: dpfe-dmem
> +      - const: dpfe-imem
> +
> +required:
> +  - compatible
> +  - reg
> +  - reg-names
> +
> +additionalProperties: false
> +
> +examples:
> +  - |
> +    dpfe-cpu@f1132000 {
> +        compatible = "brcm,bcm7271-dpfe-cpu", "brcm,dpfe-cpu";
> +        reg = <0xf1132000 0x180>,
> +              <0xf1134000 0x1000>,
> +              <0xf1138000 0x4000>;
> +        reg-names = "dpfe-cpu", "dpfe-dmem", "dpfe-imem";
> +    };
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 36aee8517ab0..be8e4af8ed64 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3855,7 +3855,7 @@ M:        Markus Mayer <mmayer@broadcom.com>
>  M:     bcm-kernel-feedback-list@broadcom.com
>  L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
>  S:     Maintained
> -F:     Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt
> +F:     Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.yaml
>  F:     drivers/memory/brcmstb_dpfe.c
>
>  BROADCOM STB NAND FLASH DRIVER
> --
> 2.30.2
>

Acked-by: Markus Mayer <mmayer@broadcom.com>

Regards,
-Markus

Re: [PATCH] dt-bindings: memory: convert Broadcom DPFE to dtschema

[Rob Herring]

On Tue, 17 Aug 2021 10:06:17 +0200, Krzysztof Kozlowski wrote:
> Convert Broadcom DDR PHY Front End (DPFE) bindings to DT schema format
> using json-schema.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> ---
>  .../memory-controllers/brcm,dpfe-cpu.txt      | 27 -----------
>  .../memory-controllers/brcm,dpfe-cpu.yaml     | 48 +++++++++++++++++++
>  MAINTAINERS                                   |  2 +-
>  3 files changed, 49 insertions(+), 28 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt
>  create mode 100644 Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.yaml
> 

Applied, thanks!