dt-bindings: arm: altera: convert socfpga-system.txt to yaml

PATCH Superseded [email protected] 2 participants 5 messages Oct 4, 2023 – Oct 5, 2023 Device tree bindings

lore

Share & tools

lore

[email protected]

author

2023-10-04 03:10 UTC #0 lore raw

PATCH 1/1 dt-bindings: arm: altera: convert socfpga-system.txt to yaml

From: Niravkumar L Rabara <[email protected]>

Convert socfpga-system.txt to altr,sys-mgr.yaml.

Signed-off-by Niravkumar L Rabara <[email protected]>

---
 .../bindings/arm/altera/altr,sys-mgr.yaml     | 50 +++++++++++++++++++
 .../bindings/arm/altera/socfpga-system.txt    | 25 ----------
 2 files changed, 50 insertions(+), 25 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml
 delete mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-system.txt

Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml new file +50 -0

new file mode 100644
index 000000000000..8deb70aef664
@@ -0,0 +1,50 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/altera/altr,sys-mgr.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Altera SOCFPGA System Manager
+
+maintainers:
+  - Dinh Nguyen <[email protected]>
+
+properties:
+  compatible:
+    oneOf:
+      - description: Cyclone5/Arria5/Arria10
+        const: altr,sys-mgr
+      - description: Stratix10 SoC
+        items:
+          - const: altr,sys-mgr-s10
+          - const: altr,sys-mgr
+
+  reg:
+    maxItems: 1
+
+  cpu1-start-addr:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description: CPU1 start address in hex
+
+required:
+  - compatible
+  - reg
+
+if:
+  properties:
+    compatible:
+      contains:
+        const: altr,sys-mgr-s10
+then:
+  properties:
+    cpu1-start-addr: false
+
+additionalProperties: false
+
+examples:
+  - |
+    sysmgr@ffd08000 {
+      compatible = "altr,sys-mgr";
+      reg = <0xffd08000 0x1000>;
+      cpu1-start-addr = <0xffd080c4>;
+    };

Documentation/devicetree/bindings/arm/altera/socfpga-system.txt deleted +0 ~~-25~~

deleted file mode 100644
index 82edbaaa3f85..000000000000
@@ -1,25 +0,0 @@
-Altera SOCFPGA System Manager
-
-Required properties:
-- compatible : "altr,sys-mgr"
-- reg : Should contain 1 register ranges(address and length)
-- cpu1-start-addr : CPU1 start address in hex.
-
-Example:
-	 sysmgr@ffd08000 {
-		compatible = "altr,sys-mgr";
-		reg = <0xffd08000 0x1000>;
-		cpu1-start-addr = <0xffd080c4>;
-	};
-
-ARM64 - Stratix10
-Required properties:
-- compatible : "altr,sys-mgr-s10"
-- reg : Should contain 1 register range(address and length)
-        for system manager register.
-
-Example:
-	 sysmgr@ffd12000 {
-		compatible = "altr,sys-mgr-s10";
-		reg = <0xffd12000 0x228>;
-	};

Signature · 1 line

2.25.1

Krzysztof Kozlowski

2023-10-04 06:45 UTC #1 lore raw

Quoted 10 lines · On 04/10/2023 05:07, [email protected] wrote:

From: Niravkumar L Rabara <[email protected]>
Convert socfpga-system.txt to altr,sys-mgr.yaml.
Signed-off-by Niravkumar L Rabara <[email protected]>
---
 .../bindings/arm/altera/altr,sys-mgr.yaml     | 50 +++++++++++++++++++
 .../bindings/arm/altera/socfpga-system.txt    | 25 ----------
 2 files changed, 50 insertions(+), 25 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml

arm is only for top-level. What is this this device about? FPGA? SoC?

Quoted 18 lines

 delete mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-system.txt

Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml new file +10 -0

new file mode 100644
index 000000000000..8deb70aef664
@@ -0,0 +1,50 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/altera/altr,sys-mgr.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Altera SOCFPGA System Manager
+
+maintainers:
+  - Dinh Nguyen <[email protected]>

Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml line 20

Quoted 10 lines

Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml new file +10 -0

+
+properties:
+  compatible:
+    oneOf:
+      - description: Cyclone5/Arria5/Arria10
+        const: altr,sys-mgr
+      - description: Stratix10 SoC
+        items:
+          - const: altr,sys-mgr-s10
+          - const: altr,sys-mgr

That's not what old binding was saying. Please describe in the commit msg differences from pure conversion.

Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml line 33

Quoted 13 lines

Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml new file +13 -0

+
+  reg:
+    maxItems: 1
+
+  cpu1-start-addr:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description: CPU1 start address in hex
+
+required:
+  - compatible
+  - reg
+
+if:

Please keep it here under "allOf:". Will save you one re-indentation on any new variant.

Quoted 7 lines

Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml new file +7 -0
+  properties:
+    compatible:
+      contains:
+        const: altr,sys-mgr-s10
+then:
+  properties:
+    cpu1-start-addr: false

Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml line 50

Quoted 10 lines

Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml new file +10 -0

+
+additionalProperties: false
+
+examples:
+  - |
+    sysmgr@ffd08000 {
+      compatible = "altr,sys-mgr";
+      reg = <0xffd08000 0x1000>;
+      cpu1-start-addr = <0xffd080c4>;
+    };

Best regards,
Krzysztof

Rabara, Niravkumar L

author

2023-10-04 10:32 UTC #2 lore raw

Quoted 16 lines

-----Original Message-----
From: Krzysztof Kozlowski <[email protected]>
Sent: Wednesday, October 4, 2023 2:46 PM
To: Rabara, Niravkumar L <[email protected]>; Rob Herring <[email protected]>; Krzysztof Kozlowski <[email protected]>; Conor Dooley <[email protected]>; Dinh Nguyen <[email protected]>
Cc: [email protected]; [email protected]
Subject: Re: [PATCH] dt-bindings: arm: altera: convert socfpga-system.txt to yaml
Quoted 4 lines · On 04/10/2023 05:07, [email protected] wrote:
From: Niravkumar L Rabara <[email protected]>
Convert socfpga-system.txt to altr,sys-mgr.yaml.

Quoted 8 lines

Quoted 6 lines
Signed-off-by Niravkumar L Rabara <[email protected]>
---
 .../bindings/arm/altera/altr,sys-mgr.yaml     | 50 +++++++++++++++++++
 .../bindings/arm/altera/socfpga-system.txt    | 25 ----------
 2 files changed, 50 insertions(+), 25 deletions(-)  create mode
100644 Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml
arm is only for top-level. What is this this device about? FPGA? SoC?

This is for Altera SoCFPGA System Manager registers, common binding file for ARM and ARM64 platforms.
Should I use "altr,socfpga-sys-mgr.yaml" as per the naming conventions?

Do you also suggest to move this yaml to different folder instead of " Documentation/devicetree/bindings/arm/altera arm/altera/" ?

Quoted 27 lines

Quoted 27 lines
 delete mode 100644
Documentation/devicetree/bindings/arm/altera/socfpga-system.txt
diff --git a/Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml b/Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml new file mode 100644
index 000000000000..8deb70aef664
Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml new file +14 -0
@@ -0,0 +1,50 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) %YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/altera/altr,sys-mgr.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Altera SOCFPGA System Manager
+
+maintainers:
+  - Dinh Nguyen <[email protected]>
+
+properties:
+  compatible:
+    oneOf:
+      - description: Cyclone5/Arria5/Arria10

Quoted 9 lines

Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml line 20
Quoted 5 lines
Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml new file +5 -0
+        const: altr,sys-mgr
+      - description: Stratix10 SoC
+        items:
+          - const: altr,sys-mgr-s10
+          - const: altr,sys-mgr
That's not what old binding was saying. Please describe in the commit msg differences from pure conversion.

Noted. Will update the commit message with below information.

Add platform names in description for clarity. ARM(32-bit) platforms Cyclone5, Arria5 and Arria10 is using "altr,sys-mgr" compatible, while ARM64 is using "altr,sys-mgr-s10" compatible.

Removed "cpu1-start-addr" for ARM64 as it is not required.

Quoted 8 lines

Quoted 8 lines
Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml new file +8 -0
+
+  reg:
+    maxItems: 1
+
+  cpu1-start-addr:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description: CPU1 start address in hex
+

Quoted 8 lines

Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml line 33
Quoted 5 lines
Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml new file +5 -0
+required:
+  - compatible
+  - reg
+
+if:
Please keep it here under "allOf:". Will save you one re-indentation on any new variant.

Sure I will update in v2 patch.

Quoted 12 lines

Quoted 12 lines
Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml new file +11 -0
+  properties:
+    compatible:
+      contains:
+        const: altr,sys-mgr-s10
+then:
+  properties:
+    cpu1-start-addr: false
+
+additionalProperties: false
+
+examples:

Quoted 8 lines

Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml line 50
Quoted 6 lines
Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml new file +6 -0
+  - |
+    sysmgr@ffd08000 {
+      compatible = "altr,sys-mgr";
+      reg = <0xffd08000 0x1000>;
+      cpu1-start-addr = <0xffd080c4>;
+    };
Best regards,
Krzysztof

Thanks,
Nirav

Krzysztof Kozlowski

2023-10-04 15:42 UTC #3 lore raw

Quoted 23 lines · Niravkumar L

Quoted 23 lines
-----Original Message-----
From: Krzysztof Kozlowski <[email protected]>
Sent: Wednesday, October 4, 2023 2:46 PM
To: Rabara, Niravkumar L <[email protected]>; Rob Herring <[email protected]>; Krzysztof Kozlowski <[email protected]>; Conor Dooley <[email protected]>; Dinh Nguyen <[email protected]>
Cc: [email protected]; [email protected]
Subject: Re: [PATCH] dt-bindings: arm: altera: convert socfpga-system.txt to yaml
Quoted 10 lines · On 04/10/2023 05:07, [email protected] wrote:
From: Niravkumar L Rabara <[email protected]>
Convert socfpga-system.txt to altr,sys-mgr.yaml.
Signed-off-by Niravkumar L Rabara <[email protected]>
---
 .../bindings/arm/altera/altr,sys-mgr.yaml     | 50 +++++++++++++++++++
 .../bindings/arm/altera/socfpga-system.txt    | 25 ----------
 2 files changed, 50 insertions(+), 25 deletions(-)  create mode
100644 Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml

Quoted 4 lines

Quoted 1 line
arm is only for top-level. What is this this device about? FPGA? SoC?
This is for Altera SoCFPGA System Manager registers, common binding file for ARM and ARM64 platforms.

So SoC part?

Quoted 4 lines

Should I use "altr,socfpga-sys-mgr.yaml" as per the naming conventions?
Do you also suggest to move this yaml to different folder instead of " Documentation/devicetree/bindings/arm/altera arm/altera/" ?

I am suggesting to move it to soc.

Best regards,
Krzysztof

Rabara, Niravkumar L

author

2023-10-05 13:48 UTC #4 lore raw

Quoted 41 lines

-----Original Message-----
From: Krzysztof Kozlowski <[email protected]>
Sent: Wednesday, October 4, 2023 11:43 PM
To: Rabara, Niravkumar L <[email protected]>; Rob Herring <[email protected]>; Krzysztof Kozlowski <[email protected]>; Conor Dooley <[email protected]>; Dinh Nguyen <[email protected]>
Cc: [email protected]; [email protected]
Subject: Re: [PATCH] dt-bindings: arm: altera: convert socfpga-system.txt to yaml
Quoted 9 lines · Niravkumar L
Quoted 9 lines
-----Original Message-----
From: Krzysztof Kozlowski <[email protected]>
Sent: Wednesday, October 4, 2023 2:46 PM
To: Rabara, Niravkumar L <[email protected]>; Rob Herring <[email protected]>; Krzysztof Kozlowski <[email protected]>;
Conor Dooley <[email protected]>; Dinh Nguyen
<[email protected]>
Quoted 17 lines
Quoted 17 lines
Cc: [email protected]; [email protected]
Subject: Re: [PATCH] dt-bindings: arm: altera: convert socfpga-system.txt to yaml
Quoted 11 lines · On 04/10/2023 05:07, [email protected] wrote:
From: Niravkumar L Rabara <[email protected]>
Convert socfpga-system.txt to altr,sys-mgr.yaml.
Signed-off-by Niravkumar L Rabara <[email protected]>
---
 .../bindings/arm/altera/altr,sys-mgr.yaml     | 50 +++++++++++++++++++
 .../bindings/arm/altera/socfpga-system.txt    | 25 ----------
 2 files changed, 50 insertions(+), 25 deletions(-)  create mode
100644 Documentation/devicetree/bindings/arm/altera/altr,sys-mgr.yaml

Quoted 6 lines

Quoted 4 lines
Quoted 1 line
arm is only for top-level. What is this this device about? FPGA? SoC?
This is for Altera SoCFPGA System Manager registers, common binding file for ARM and ARM64 platforms.
So SoC part?

Yes

Quoted 7 lines

Quoted 5 lines
Should I use "altr,socfpga-sys-mgr.yaml" as per the naming conventions?
Do you also suggest to move this yaml to different folder instead of " Documentation/devicetree/bindings/arm/altera arm/altera/" ?
I am suggesting to move it to soc.

Alright, I will create a folder "altera" in soc directory and move it there in V2. Documentation/devicetree/bindings/soc/altera/altr,socfpga-sys-mgr.yaml

Quoted 4 lines

Best regards,
Krzysztof

Thanks,
Nirav