Skip to contentSkip to conversation

dt-bindings: sram: Allow for the childs nodes to be called sections

PATCH Applied Maxime Ripard 3 participants 9 messages Dec 9, 2019 – Dec 18, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/4 dt-bindings: sram: Allow for the childs nodes to be called sections

The generic SRAM binding currently only allows for child nodes of an SRAM to be called sram too. However, these are also called sections in a number of device tree, which seems a bit more accurate.

Let's change the name pattern to allow both.

---
 Documentation/devicetree/bindings/sram/sram.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/sram/sram.yaml +1 -1
index ee2287a1b14d..83e3bc64d6fc 100644
@@ -55,7 +55,7 @@ properties:
     type: boolean
 
 patternProperties:
-  "^([a-z]*-)?sram@[a-f0-9]+$":
+  "^([a-z]*-)?sram(-section)?@[a-f0-9]+$":
     type: object
     description:
       Each child of the sram node specifies a region of reserved memory.
Signature · 1 line
2.23.0
#1 lore raw

PATCH 2/4 dt-bindings: sram: Allow for more specific compatibles

Even though the generic mmio-sram binding has a list of the sections compatible allowed, most device trees have more specific compatibles attached to those generic ones.

This creates warnings at the moment, and we don't really want to cripple the generic binding with all the vendor specific combinations that would prove to be hard to maintain.

Let's allow additional compatibles for the sections, and then we can have the vendor-specific bindings to reduce the scope of what's allowed exactly.

---
 .../devicetree/bindings/sram/sram.yaml        | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)
Documentation/devicetree/bindings/sram/sram.yaml +10 -9
index 83e3bc64d6fc..9ffef983510b 100644
@@ -64,15 +64,16 @@ patternProperties:
         description:
           Should contain a vendor specific string in the form
           <vendor>,[<device>-]<usage>
-        enum:
-          - allwinner,sun9i-a80-smp-sram
-          - amlogic,meson8-smp-sram
-          - amlogic,meson8b-smp-sram
-          - renesas,smp-sram
-          - rockchip,rk3066-smp-sram
-          - samsung,exynos4210-sysram
-          - samsung,exynos4210-sysram-ns
-          - socionext,milbeaut-smp-sram
+        contains:
+          enum:
+            - allwinner,sun9i-a80-smp-sram
+            - amlogic,meson8-smp-sram
+            - amlogic,meson8b-smp-sram
+            - renesas,smp-sram
+            - rockchip,rk3066-smp-sram
+            - samsung,exynos4210-sysram
+            - samsung,exynos4210-sysram-ns
+            - socionext,milbeaut-smp-sram
 
       reg:
         description:
Signature · 1 line
2.23.0
maintainer Applied
#2 lore raw

Re: [PATCH 2/4] dt-bindings: sram: Allow for more specific compatibles

Quoted 8 lines · Maxime Ripard

Even though the generic mmio-sram binding has a list of the sections compatible allowed, most device trees have more specific compatibles attached to those generic ones.

This creates warnings at the moment, and we don't really want to cripple the generic binding with all the vendor specific combinations that would prove to be hard to maintain.

Quoted 8 lines

Let's allow additional compatibles for the sections, and then we can have the vendor-specific bindings to reduce the scope of what's allowed exactly.

---
 .../devicetree/bindings/sram/sram.yaml        | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

Applied, thanks.

Rob

#3 lore raw

PATCH 3/4 dt-bindings: sram: Add Allwinner SRAM compatibles

In reply to Maxime Ripard

The mmio-sram binding was added missing a few SRAM sections compatible for allwinner SoCs. Let's add them.

---
 Documentation/devicetree/bindings/sram/sram.yaml | 4 ++++
 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/sram/sram.yaml +4 -0
index 9ffef983510b..7b83cc6c9bfa 100644
@@ -66,7 +66,11 @@ patternProperties:
           <vendor>,[<device>-]<usage>
         contains:
           enum:
+            - allwinner,sun4i-a10-sram-a3-a4
+            - allwinner,sun4i-a10-sram-c1
+            - allwinner,sun4i-a10-sram-d
             - allwinner,sun9i-a80-smp-sram
+            - allwinner,sun50i-a64-sram-c
             - amlogic,meson8-smp-sram
             - amlogic,meson8b-smp-sram
             - renesas,smp-sram
Signature · 1 line
2.23.0
maintainer Applied
#4 lore raw

Re: [PATCH 3/4] dt-bindings: sram: Add Allwinner SRAM compatibles

Quoted 8 lines · Maxime Ripard

The mmio-sram binding was added missing a few SRAM sections compatible for allwinner SoCs. Let's add them.

---
 Documentation/devicetree/bindings/sram/sram.yaml | 4 ++++
 1 file changed, 4 insertions(+)

Applied, thanks.

Rob

#5 lore raw

PATCH 4/4 dt-bindings: sram: Convert Allwinner A10 system controller to a schema

In reply to Maxime Ripard

The older Allwinner SoCs have a system controller that is supported in Linux, with a matching Device Tree binding.

Now that we have the DT validation in place, let's convert the device tree bindings for that controller over to a YAML schemas.

---
 .../allwinner,sun4i-a10-system-control.yaml   | 140 ++++++++++++++++++
 .../devicetree/bindings/sram/sunxi-sram.txt   | 113 --------------
 2 files changed, 140 insertions(+), 113 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml
 delete mode 100644 Documentation/devicetree/bindings/sram/sunxi-sram.txt
Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml new file +140 -0
new file mode 100644
index 000000000000..3a368fbdff58
@@ -0,0 +1,140 @@
+# SPDX-License-Identifier: GPL-2.0+
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/sram/allwinner,sun4i-a10-system-control.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Allwinner A10 System Control Device Tree Bindings
+
+maintainers:
+  - Chen-Yu Tsai <[email protected]>
+  - Maxime Ripard <[email protected]>
+
+description:
+  The SRAM controller found on most Allwinner devices is represented
+  by a regular node for the SRAM controller itself, with sub-nodes
+  representing the SRAM handled by the SRAM controller.
+
+properties:
+  "#address-cells":
+    const: 1
+
+  "#size-cells":
+    const: 1
+
+  compatible:
+    oneOf:
+      - const: allwinner,sun4i-a10-sram-controller
+        deprecated: true
+      - const: allwinner,sun4i-a10-system-control
+      - const: allwinner,sun5i-a13-system-control
+      - items:
+        - const: allwinner,sun7i-a20-system-control
+        - const: allwinner,sun4i-a10-system-control
+      - const: allwinner,sun8i-a23-system-control
+      - const: allwinner,sun8i-h3-system-control
+      - const: allwinner,sun50i-a64-sram-controller
+        deprecated: true
+      - const: allwinner,sun50i-a64-system-control
+      - const: allwinner,sun50i-h5-system-control
+      - items:
+        - const: allwinner,sun50i-h6-system-control
+        - const: allwinner,sun50i-a64-system-control
+      - items:
+        - const: allwinner,suniv-f1c100s-system-control
+        - const: allwinner,sun4i-a10-system-control
+
+  reg:
+    maxItems: 1
+
+  ranges: true
+
+patternProperties:
+  "^sram@[a-z0-9]+":
+    type: object
+
+    properties:
+      compatible:
+        const: mmio-sram
+
+    patternProperties:
+      "^sram-section?@[a-f0-9]+$":
+        type: object
+
+        compatible:
+          oneOf:
+            - const: allwinner,sun4i-a10-sram-a3-a4
+            - const: allwinner,sun4i-a10-sram-c1
+            - const: allwinner,sun4i-a10-sram-d
+            - const: allwinner,sun50i-a64-sram-c
+            - items:
+              - const: allwinner,sun5i-a13-sram-a3-a4
+              - const: allwinner,sun4i-a10-sram-a3-a4
+            - items:
+              - const: allwinner,sun7i-a20-sram-a3-a4
+              - const: allwinner,sun4i-a10-sram-a3-a4
+            - items:
+              - const: allwinner,sun5i-a13-sram-c1
+              - const: allwinner,sun4i-a10-sram-c1
+            - items:
+              - const: allwinner,sun7i-a20-sram-c1
+              - const: allwinner,sun4i-a10-sram-c1
+            - items:
+              - const: allwinner,sun8i-a23-sram-c1
+              - const: allwinner,sun4i-a10-sram-c1
+            - items:
+              - const: allwinner,sun8i-h3-sram-c1
+              - const: allwinner,sun4i-a10-sram-c1
+            - items:
+              - const: allwinner,sun50i-a64-sram-c1
+              - const: allwinner,sun4i-a10-sram-c1
+            - items:
+              - const: allwinner,sun50i-h5-sram-c1
+              - const: allwinner,sun4i-a10-sram-c1
+            - items:
+              - const: allwinner,sun50i-h6-sram-c1
+              - const: allwinner,sun4i-a10-sram-c1
+            - items:
+              - const: allwinner,sun5i-a13-sram-d
+              - const: allwinner,sun4i-a10-sram-d
+            - items:
+              - const: allwinner,sun7i-a20-sram-d
+              - const: allwinner,sun4i-a10-sram-d
+            - items:
+              - const: allwinner,suniv-f1c100s-sram-d
+              - const: allwinner,sun4i-a10-sram-d
+            - items:
+              - const: allwinner,sun50i-h6-sram-c
+              - const: allwinner,sun50i-a64-sram-c
+
+
+required:
+  - "#address-cells"
+  - "#size-cells"
+  - compatible
+  - reg
+
+additionalProperties: false
+
+examples:
+  - |
+    system-control@1c00000 {
+      compatible = "allwinner,sun4i-a10-system-control";
+      reg = <0x01c00000 0x30>;
+      #address-cells = <1>;
+      #size-cells = <1>;
+      ranges;
+
+      sram_a: sram@00000000 {
+        compatible = "mmio-sram";
+        reg = <0x00000000 0xc000>;
+        #address-cells = <1>;
+        #size-cells = <1>;
+        ranges = <0 0x00000000 0xc000>;
+
+        emac_sram: sram-section@8000 {
+          compatible = "allwinner,sun4i-a10-sram-a3-a4";
+          reg = <0x8000 0x4000>;
+        };
+      };
+    };
Documentation/devicetree/bindings/sram/sunxi-sram.txt deleted +0 -113

113 lines not on this page · raw message

Signature · 1 line
2.23.0
maintainer Applied
#6 lore raw

Re: [PATCH 4/4] dt-bindings: sram: Convert Allwinner A10 system controller to a schema

Quoted 6 lines · Maxime Ripard

The older Allwinner SoCs have a system controller that is supported in Linux, with a matching Device Tree binding.

Now that we have the DT validation in place, let's convert the device tree bindings for that controller over to a YAML schemas.

Quoted 8 lines
---
 .../allwinner,sun4i-a10-system-control.yaml   | 140 ++++++++++++++++++
 .../devicetree/bindings/sram/sunxi-sram.txt   | 113 --------------
 2 files changed, 140 insertions(+), 113 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml
 delete mode 100644 Documentation/devicetree/bindings/sram/sunxi-sram.txt

Applied, thanks.

Rob

#7 lore raw

Re: [PATCH 4/4] dt-bindings: sram: Convert Allwinner A10 system controller to a schema

In reply to Maxime Ripard
Quoted 75 lines · Maxime Ripard

The older Allwinner SoCs have a system controller that is supported in Linux, with a matching Device Tree binding.

Now that we have the DT validation in place, let's convert the device tree bindings for that controller over to a YAML schemas.

---
 .../allwinner,sun4i-a10-system-control.yaml   | 140 ++++++++++++++++++
 .../devicetree/bindings/sram/sunxi-sram.txt   | 113 --------------
 2 files changed, 140 insertions(+), 113 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml
 delete mode 100644 Documentation/devicetree/bindings/sram/sunxi-sram.txt
Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml new file +54 -0
new file mode 100644
index 000000000000..3a368fbdff58
@@ -0,0 +1,140 @@
+# SPDX-License-Identifier: GPL-2.0+
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/sram/allwinner,sun4i-a10-system-control.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Allwinner A10 System Control Device Tree Bindings
+
+maintainers:
+  - Chen-Yu Tsai <[email protected]>
+  - Maxime Ripard <[email protected]>
+
+description:
+  The SRAM controller found on most Allwinner devices is represented
+  by a regular node for the SRAM controller itself, with sub-nodes
+  representing the SRAM handled by the SRAM controller.
+
+properties:
+  "#address-cells":
+    const: 1
+
+  "#size-cells":
+    const: 1
+
+  compatible:
+    oneOf:
+      - const: allwinner,sun4i-a10-sram-controller
+        deprecated: true
+      - const: allwinner,sun4i-a10-system-control
+      - const: allwinner,sun5i-a13-system-control
+      - items:
+        - const: allwinner,sun7i-a20-system-control
+        - const: allwinner,sun4i-a10-system-control
+      - const: allwinner,sun8i-a23-system-control
+      - const: allwinner,sun8i-h3-system-control
+      - const: allwinner,sun50i-a64-sram-controller
+        deprecated: true
+      - const: allwinner,sun50i-a64-system-control
+      - const: allwinner,sun50i-h5-system-control
+      - items:
+        - const: allwinner,sun50i-h6-system-control
+        - const: allwinner,sun50i-a64-system-control
+      - items:
+        - const: allwinner,suniv-f1c100s-system-control
+        - const: allwinner,sun4i-a10-system-control
+
+  reg:
+    maxItems: 1
+
+  ranges: true
+
+patternProperties:
+  "^sram@[a-z0-9]+":
+    type: object

Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml line 64

Quoted 10 lines
Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml new file +10 -0
+
+    properties:
+      compatible:
+        const: mmio-sram
+
+    patternProperties:
+      "^sram-section?@[a-f0-9]+$":
+        type: object
+
+        compatible:

This should be under 'properties'. I fixed it up.

I think this should have triggered an error before, but I reworked the meta-schema a bit today as there were several cases where we weren't descending levels correctly.

Rob

maintainer Applied
#8 lore raw
In reply to Maxime Ripard
Quoted 11 lines · Maxime Ripard

The generic SRAM binding currently only allows for child nodes of an SRAM to be called sram too. However, these are also called sections in a number of device tree, which seems a bit more accurate.

Let's change the name pattern to allow both.

---
 Documentation/devicetree/bindings/sram/sram.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

Rob