Skip to contentSkip to conversation

dt-bindings: clocks: Convert Allwinner legacy clocks to schemas

PATCH Applied Maxime Ripard 2 participants 6 messages Dec 19, 2019 – Dec 20, 2019

Subsystems (5)

v1 of 3 Applied Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 dt-bindings: clocks: Convert Allwinner legacy clocks to schemas

The Allwinner SoCs have a legacy set of bindings (and a framework to support it in Linux) for their clock controllers.

Now that we have the DT validation in place, let's split into separate file and convert the device tree bindings for those clocks to schemas, and mark them all as deprecated.

---
 .../clock/allwinner,sun4i-a10-ahb-clk.yaml    | 108 +++++++++
 .../clock/allwinner,sun4i-a10-apb0-clk.yaml   |  50 ++++
 .../clock/allwinner,sun4i-a10-apb1-clk.yaml   |  52 ++++
 .../clock/allwinner,sun4i-a10-axi-clk.yaml    |  61 +++++
 .../clock/allwinner,sun4i-a10-cpu-clk.yaml    |  52 ++++
 .../allwinner,sun4i-a10-display-clk.yaml      |  57 +++++
 .../clock/allwinner,sun4i-a10-gates-clk.yaml  | 152 ++++++++++++
 .../clock/allwinner,sun4i-a10-mbus-clk.yaml   |  63 +++++
 .../clock/allwinner,sun4i-a10-mmc-clk.yaml    |  87 +++++++
 .../clock/allwinner,sun4i-a10-mod0-clk.yaml   |  80 +++++++
 .../clock/allwinner,sun4i-a10-mod1-clk.yaml   |  57 +++++
 .../clock/allwinner,sun4i-a10-osc-clk.yaml    |  51 ++++
 .../clock/allwinner,sun4i-a10-pll1-clk.yaml   |  71 ++++++
 .../clock/allwinner,sun4i-a10-pll3-clk.yaml   |  50 ++++
 .../clock/allwinner,sun4i-a10-pll5-clk.yaml   |  53 +++++
 .../clock/allwinner,sun4i-a10-pll6-clk.yaml   |  53 +++++
 .../allwinner,sun4i-a10-tcon-ch0-clk.yaml     |  77 ++++++
 .../clock/allwinner,sun4i-a10-usb-clk.yaml    | 166 +++++++++++++
 .../clock/allwinner,sun4i-a10-ve-clk.yaml     |  55 +++++
 .../clock/allwinner,sun5i-a13-ahb-clk.yaml    |  52 ++++
 .../clock/allwinner,sun6i-a31-pll6-clk.yaml   |  53 +++++
 .../clock/allwinner,sun7i-a20-gmac-clk.yaml   |  51 ++++
 .../clock/allwinner,sun7i-a20-out-clk.yaml    |  52 ++++
 .../allwinner,sun8i-h3-bus-gates-clk.yaml     | 103 ++++++++
 .../clock/allwinner,sun9i-a80-ahb-clk.yaml    |  52 ++++
 .../clock/allwinner,sun9i-a80-apb0-clk.yaml   |  63 +++++
 .../clock/allwinner,sun9i-a80-cpus-clk.yaml   |  52 ++++
 .../clock/allwinner,sun9i-a80-gt-clk.yaml     |  52 ++++
 .../allwinner,sun9i-a80-mmc-config-clk.yaml   |  68 ++++++
 .../clock/allwinner,sun9i-a80-pll4-clk.yaml   |  50 ++++
 .../allwinner,sun9i-a80-usb-mod-clk.yaml      |  60 +++++
 .../allwinner,sun9i-a80-usb-phy-clk.yaml      |  60 +++++
 .../devicetree/bindings/clock/sunxi.txt       | 225 ------------------
 33 files changed, 2163 insertions(+), 225 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ahb-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-apb0-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-apb1-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-axi-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-cpu-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-display-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-gates-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mbus-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mmc-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mod0-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mod1-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-osc-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll1-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll3-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll5-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll6-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-tcon-ch0-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-usb-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ve-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun5i-a13-ahb-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun6i-a31-pll6-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun7i-a20-gmac-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun7i-a20-out-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun8i-h3-bus-gates-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-ahb-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-apb0-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-cpus-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-gt-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-mmc-config-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-pll4-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-mod-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-phy-clk.yaml
 delete mode 100644 Documentation/devicetree/bindings/clock/sunxi.txt
Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ahb-clk.yaml new file +108 -0
new file mode 100644
index 000000000000..558db4b6ed17
@@ -0,0 +1,108 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/allwinner,sun4i-a10-ahb-clk.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Allwinner A10 AHB Clock Device Tree Bindings
+
+maintainers:
+  - Chen-Yu Tsai <[email protected]>
+  - Maxime Ripard <[email protected]>
+
+deprecated: true
+
+properties:
+  "#clock-cells":
+    const: 0
+
+  compatible:
+    enum:
+      - allwinner,sun4i-a10-ahb-clk
+      - allwinner,sun6i-a31-ahb1-clk
+      - allwinner,sun8i-h3-ahb2-clk
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    minItems: 1
+    maxItems: 4
+    description: >
+      The parent order must match the hardware programming order.
+
+  clock-output-names:
+    maxItems: 1
+
+required:
+  - "#clock-cells"
+  - compatible
+  - reg
+  - clocks
+  - clock-output-names
+
+additionalProperties: false
+
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: allwinner,sun4i-a10-ahb-clk
+
+    then:
+      properties:
+        clocks:
+          maxItems: 1
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: allwinner,sun6i-a31-ahb1-clk
+
+    then:
+      properties:
+        clocks:
+          maxItems: 4
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: allwinner,sun8i-h3-ahb2-clk
+
+    then:
+      properties:
+        clocks:
+          maxItems: 2
+
+examples:
+  - |
+    ahb@1c20054 {
+        #clock-cells = <0>;
+        compatible = "allwinner,sun4i-a10-ahb-clk";
+        reg = <0x01c20054 0x4>;
+        clocks = <&axi>;
+        clock-output-names = "ahb";
+    };
+
+  - |
+    ahb1@1c20054 {
+        #clock-cells = <0>;
+        compatible = "allwinner,sun6i-a31-ahb1-clk";
+        reg = <0x01c20054 0x4>;
+        clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6 0>;
+        clock-output-names = "ahb1";
+    };
+
+  - |
+    ahb2_clk@1c2005c {
+        #clock-cells = <0>;
+        compatible = "allwinner,sun8i-h3-ahb2-clk";
+        reg = <0x01c2005c 0x4>;
+        clocks = <&ahb1>, <&pll6d2>;
+        clock-output-names = "ahb2";
+    };
+
+...
Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-apb0-clk.yaml new file +50 -0

50 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-apb1-clk.yaml new file +52 -0

52 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-axi-clk.yaml new file +61 -0

61 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-cpu-clk.yaml new file +52 -0

52 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-display-clk.yaml new file +57 -0

57 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-gates-clk.yaml new file +152 -0

152 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mbus-clk.yaml new file +63 -0

63 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mmc-clk.yaml new file +87 -0

87 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mod0-clk.yaml new file +80 -0

80 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mod1-clk.yaml new file +57 -0

57 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-osc-clk.yaml new file +51 -0

51 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll1-clk.yaml new file +71 -0

71 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll3-clk.yaml new file +50 -0

50 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll5-clk.yaml new file +53 -0

53 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll6-clk.yaml new file +53 -0

53 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-tcon-ch0-clk.yaml new file +77 -0

77 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-usb-clk.yaml new file +166 -0

166 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ve-clk.yaml new file +55 -0

55 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun5i-a13-ahb-clk.yaml new file +52 -0

52 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun6i-a31-pll6-clk.yaml new file +53 -0

53 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun7i-a20-gmac-clk.yaml new file +51 -0

51 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun7i-a20-out-clk.yaml new file +52 -0

52 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun8i-h3-bus-gates-clk.yaml new file +103 -0

103 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-ahb-clk.yaml new file +52 -0

52 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-apb0-clk.yaml new file +63 -0

63 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-cpus-clk.yaml new file +52 -0

52 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-gt-clk.yaml new file +52 -0

52 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-mmc-config-clk.yaml new file +68 -0

68 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-pll4-clk.yaml new file +50 -0

50 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-mod-clk.yaml new file +60 -0

60 lines not on this page · raw message

Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-phy-clk.yaml new file +60 -0

60 lines not on this page · raw message

Documentation/devicetree/bindings/clock/sunxi.txt deleted +0 -225

225 lines not on this page · raw message

Signature · 1 line
2.23.0
#1 lore raw

PATCH 2/3 dt-bindings: mfd: Convert Allwinner legacy PRCM bindings to schemas

The Allwinner SoCs have a legacy set of bindings (and a drivers to support it in Linux) to support the PRCM unit found in most recent SoCs.

Now that we have the DT validation in place, let's split into separate file and convert the device tree bindings for those controllers to schemas, and mark them all as deprecated.

---
 .../mfd/allwinner,sun6i-a31-prcm.yaml         | 219 ++++++++++++++++++
 .../mfd/allwinner,sun8i-a23-prcm.yaml         | 200 ++++++++++++++++
 .../devicetree/bindings/mfd/sun6i-prcm.txt    |  59 -----
 3 files changed, 419 insertions(+), 59 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mfd/allwinner,sun6i-a31-prcm.yaml
 create mode 100644 Documentation/devicetree/bindings/mfd/allwinner,sun8i-a23-prcm.yaml
 delete mode 100644 Documentation/devicetree/bindings/mfd/sun6i-prcm.txt
Documentation/devicetree/bindings/mfd/allwinner,sun6i-a31-prcm.yaml new file +219 -0
new file mode 100644
index 000000000000..d131759ccaf3
@@ -0,0 +1,219 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/mfd/allwinner,sun6i-a31-prcm.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Allwinner A31 PRCM Device Tree Bindings
+
+maintainers:
+  - Chen-Yu Tsai <[email protected]>
+  - Maxime Ripard <[email protected]>
+
+deprecated: true
+
+properties:
+  compatible:
+    const: allwinner,sun6i-a31-prcm
+
+  reg:
+    maxItems: 1
+
+patternProperties:
+  "^.*_(clk|rst)$":
+    type: object
+
+    properties:
+      compatible:
+        enum:
+          - allwinner,sun4i-a10-mod0-clk
+          - allwinner,sun6i-a31-apb0-clk
+          - allwinner,sun6i-a31-apb0-gates-clk
+          - allwinner,sun6i-a31-ar100-clk
+          - allwinner,sun6i-a31-clock-reset
+          - fixed-factor-clock
+
+    allOf:
+      - if:
+          properties:
+            compatible:
+              contains:
+                const: allwinner,sun6i-a31-apb0-clk
+
+        then:
+          properties:
+            "#clock-cells":
+              const: 0
+
+            # Already checked in the main schema
+            compatible: true
+
+            clocks:
+              maxItems: 1
+
+            clock-output-names:
+              maxItems: 1
+
+            phandle: true
+
+          required:
+            - "#clock-cells"
+            - compatible
+            - clocks
+            - clock-output-names
+
+          additionalProperties: false
+
+      - if:
+          properties:
+            compatible:
+              contains:
+                const: allwinner,sun6i-a31-apb0-gates-clk
+
+        then:
+          properties:
+            "#clock-cells":
+              const: 1
+              description: >
+                This additional argument passed to that clock is the
+                offset of the bit controlling this particular gate in
+                the register.
+
+            # Already checked in the main schema
+            compatible: true
+
+            clocks:
+              maxItems: 1
+
+            clock-output-names:
+              minItems: 1
+              maxItems: 32
+
+            phandle: true
+
+          required:
+            - "#clock-cells"
+            - compatible
+            - clocks
+            - clock-output-names
+
+          additionalProperties: false
+
+      - if:
+          properties:
+            compatible:
+              contains:
+                const: allwinner,sun6i-a31-ar100-clk
+
+        then:
+          properties:
+            "#clock-cells":
+              const: 0
+
+            # Already checked in the main schema
+            compatible: true
+
+            clocks:
+              maxItems: 4
+              description: >
+                The parent order must match the hardware programming
+                order.
+
+            clock-output-names:
+              maxItems: 1
+
+            phandle: true
+
+          required:
+            - "#clock-cells"
+            - compatible
+            - clocks
+            - clock-output-names
+
+          additionalProperties: false
+
+      - if:
+          properties:
+            compatible:
+              contains:
+                const: allwinner,sun6i-a31-clock-reset
+
+        then:
+          properties:
+            "#reset-cells":
+              const: 1
+
+            # Already checked in the main schema
+            compatible: true
+
+            phandle: true
+
+          required:
+            - "#reset-cells"
+            - compatible
+
+          additionalProperties: false
+
+required:
+  - compatible
+  - reg
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/clock/sun6i-a31-ccu.h>
+
+    prcm@1f01400 {
+        compatible = "allwinner,sun6i-a31-prcm";
+        reg = <0x01f01400 0x200>;
+
+        ar100: ar100_clk {
+            compatible = "allwinner,sun6i-a31-ar100-clk";
+            #clock-cells = <0>;
+            clocks = <&rtc 0>, <&osc24M>,
+                     <&ccu CLK_PLL_PERIPH>,
+                     <&ccu CLK_PLL_PERIPH>;
+            clock-output-names = "ar100";
+        };
+
+        ahb0: ahb0_clk {
+            compatible = "fixed-factor-clock";
+            #clock-cells = <0>;
+            clock-div = <1>;
+            clock-mult = <1>;
+            clocks = <&ar100>;
+            clock-output-names = "ahb0";
+        };
+
+        apb0: apb0_clk {
+            compatible = "allwinner,sun6i-a31-apb0-clk";
+            #clock-cells = <0>;
+            clocks = <&ahb0>;
+            clock-output-names = "apb0";
+        };
+
+        apb0_gates: apb0_gates_clk {
+            compatible = "allwinner,sun6i-a31-apb0-gates-clk";
+            #clock-cells = <1>;
+            clocks = <&apb0>;
+            clock-output-names = "apb0_pio", "apb0_ir",
+                                 "apb0_timer", "apb0_p2wi",
+                                 "apb0_uart", "apb0_1wire",
+                                 "apb0_i2c";
+        };
+
+        ir_clk: ir_clk {
+            #clock-cells = <0>;
+            compatible = "allwinner,sun4i-a10-mod0-clk";
+            clocks = <&rtc 0>, <&osc24M>;
+            clock-output-names = "ir";
+        };
+
+        apb0_rst: apb0_rst {
+            compatible = "allwinner,sun6i-a31-clock-reset";
+            #reset-cells = <1>;
+        };
+    };
+
+...
Documentation/devicetree/bindings/mfd/allwinner,sun8i-a23-prcm.yaml new file +200 -0

200 lines not on this page · raw message

Documentation/devicetree/bindings/mfd/sun6i-prcm.txt deleted +0 -59

59 lines not on this page · raw message

Signature · 1 line
2.23.0
maintainer Applied
#2 lore raw

Re: [PATCH 2/3] dt-bindings: mfd: Convert Allwinner legacy PRCM bindings to schemas

Quoted 8 lines · Maxime Ripard

The Allwinner SoCs have a legacy set of bindings (and a drivers to support it in Linux) to support the PRCM unit found in most recent SoCs.

Now that we have the DT validation in place, let's split into separate file and convert the device tree bindings for those controllers to schemas, and mark them all as deprecated.

Quoted 9 lines
---
 .../mfd/allwinner,sun6i-a31-prcm.yaml         | 219 ++++++++++++++++++
 .../mfd/allwinner,sun8i-a23-prcm.yaml         | 200 ++++++++++++++++
 .../devicetree/bindings/mfd/sun6i-prcm.txt    |  59 -----
 3 files changed, 419 insertions(+), 59 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mfd/allwinner,sun6i-a31-prcm.yaml
 create mode 100644 Documentation/devicetree/bindings/mfd/allwinner,sun8i-a23-prcm.yaml
 delete mode 100644 Documentation/devicetree/bindings/mfd/sun6i-prcm.txt

Applied, thanks.

Rob

#3 lore raw

PATCH 3/3 dt-bindings: resets: Convert Allwinner legacy resets to schemas

In reply to Maxime Ripard

The Allwinner SoCs have a legacy set of bindings (and a framework to support it in Linux) for their reset controllers.

Now that we have the DT validation in place, let's split into separate file and convert the device tree bindings for those resets to schemas, and mark them all as deprecated.

---
 .../allwinner,sun6i-a31-clock-reset.yaml      | 68 +++++++++++++++++++
 .../reset/allwinner,sunxi-clock-reset.txt     | 21 ------
 2 files changed, 68 insertions(+), 21 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/reset/allwinner,sun6i-a31-clock-reset.yaml
 delete mode 100644 Documentation/devicetree/bindings/reset/allwinner,sunxi-clock-reset.txt
Documentation/devicetree/bindings/reset/allwinner,sun6i-a31-clock-reset.yaml new file +68 -0
new file mode 100644
index 000000000000..001c0d2a8c1f
@@ -0,0 +1,68 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/reset/allwinner,sun6i-a31-clock-reset.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Allwinner A31 Peripheral Reset Controller Device Tree Bindings
+
+maintainers:
+  - Chen-Yu Tsai <[email protected]>
+  - Maxime Ripard <[email protected]>
+
+deprecated: true
+
+select:
+  properties:
+    compatible:
+      contains:
+        enum:
+          - allwinner,sun6i-a31-ahb1-reset
+          - allwinner,sun6i-a31-clock-reset
+
+  # The PRCM on the A31 and A23 will have the reg property missing,
+  # since it's set at the upper level node, and will be validated by
+  # PRCM's schema. Make sure we only validate standalone nodes.
+  required:
+    - compatible
+    - reg
+
+properties:
+  "#reset-cells":
+    const: 1
+    description: >
+      This additional argument passed to that reset controller is the
+      offset of the bit controlling this particular reset line in the
+      register.
+
+  compatible:
+    enum:
+      - allwinner,sun6i-a31-ahb1-reset
+      - allwinner,sun6i-a31-clock-reset
+
+  reg:
+    maxItems: 1
+
+required:
+  - "#reset-cells"
+  - compatible
+  - reg
+
+additionalProperties: false
+
+examples:
+  - |
+    ahb1_rst: reset@1c202c0 {
+        #reset-cells = <1>;
+        compatible = "allwinner,sun6i-a31-ahb1-reset";
+        reg = <0x01c202c0 0xc>;
+    };
+
+  - |
+    apbs_rst: reset@80014b0 {
+        #reset-cells = <1>;
+        compatible = "allwinner,sun6i-a31-clock-reset";
+        reg = <0x080014b0 0x4>;
+    };
+
+...
Documentation/devicetree/bindings/reset/allwinner,sunxi-clock-reset.txt deleted +0 -21
deleted file mode 100644
index 4ca66c96fe97..000000000000
@@ -1,21 +0,0 @@
-Allwinner sunxi Peripheral Reset Controller
-===========================================
-
-Please also refer to reset.txt in this directory for common reset
-controller binding usage.
-
-Required properties:
-- compatible: Should be one of the following:
-  "allwinner,sun6i-a31-ahb1-reset"
-  "allwinner,sun6i-a31-clock-reset"
-- reg: should be register base and length as documented in the
-  datasheet
-- #reset-cells: 1, see below
-
-example:
-
-ahb1_rst: reset@1c202c0 {
-	#reset-cells = <1>;
-	compatible = "allwinner,sun6i-a31-ahb1-reset";
-	reg = <0x01c202c0 0xc>;
-};
Signature · 1 line
2.23.0
maintainer Applied
#4 lore raw

Re: [PATCH 3/3] dt-bindings: resets: Convert Allwinner legacy resets to schemas

Quoted 7 lines · Maxime Ripard

The Allwinner SoCs have a legacy set of bindings (and a framework to support it in Linux) for their reset controllers.

Now that we have the DT validation in place, let's split into separate file and convert the device tree bindings for those resets to schemas, and mark them all as deprecated.

Quoted 8 lines
---
 .../allwinner,sun6i-a31-clock-reset.yaml      | 68 +++++++++++++++++++
 .../reset/allwinner,sunxi-clock-reset.txt     | 21 ------
 2 files changed, 68 insertions(+), 21 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/reset/allwinner,sun6i-a31-clock-reset.yaml
 delete mode 100644 Documentation/devicetree/bindings/reset/allwinner,sunxi-clock-reset.txt

Applied, thanks.

Rob

maintainer Applied
#5 lore raw
In reply to Maxime Ripard
Quoted 68 lines · Maxime Ripard

The Allwinner SoCs have a legacy set of bindings (and a framework to support it in Linux) for their clock controllers.

Now that we have the DT validation in place, let's split into separate file and convert the device tree bindings for those clocks to schemas, and mark them all as deprecated.

---
 .../clock/allwinner,sun4i-a10-ahb-clk.yaml    | 108 +++++++++
 .../clock/allwinner,sun4i-a10-apb0-clk.yaml   |  50 ++++
 .../clock/allwinner,sun4i-a10-apb1-clk.yaml   |  52 ++++
 .../clock/allwinner,sun4i-a10-axi-clk.yaml    |  61 +++++
 .../clock/allwinner,sun4i-a10-cpu-clk.yaml    |  52 ++++
 .../allwinner,sun4i-a10-display-clk.yaml      |  57 +++++
 .../clock/allwinner,sun4i-a10-gates-clk.yaml  | 152 ++++++++++++
 .../clock/allwinner,sun4i-a10-mbus-clk.yaml   |  63 +++++
 .../clock/allwinner,sun4i-a10-mmc-clk.yaml    |  87 +++++++
 .../clock/allwinner,sun4i-a10-mod0-clk.yaml   |  80 +++++++
 .../clock/allwinner,sun4i-a10-mod1-clk.yaml   |  57 +++++
 .../clock/allwinner,sun4i-a10-osc-clk.yaml    |  51 ++++
 .../clock/allwinner,sun4i-a10-pll1-clk.yaml   |  71 ++++++
 .../clock/allwinner,sun4i-a10-pll3-clk.yaml   |  50 ++++
 .../clock/allwinner,sun4i-a10-pll5-clk.yaml   |  53 +++++
 .../clock/allwinner,sun4i-a10-pll6-clk.yaml   |  53 +++++
 .../allwinner,sun4i-a10-tcon-ch0-clk.yaml     |  77 ++++++
 .../clock/allwinner,sun4i-a10-usb-clk.yaml    | 166 +++++++++++++
 .../clock/allwinner,sun4i-a10-ve-clk.yaml     |  55 +++++
 .../clock/allwinner,sun5i-a13-ahb-clk.yaml    |  52 ++++
 .../clock/allwinner,sun6i-a31-pll6-clk.yaml   |  53 +++++
 .../clock/allwinner,sun7i-a20-gmac-clk.yaml   |  51 ++++
 .../clock/allwinner,sun7i-a20-out-clk.yaml    |  52 ++++
 .../allwinner,sun8i-h3-bus-gates-clk.yaml     | 103 ++++++++
 .../clock/allwinner,sun9i-a80-ahb-clk.yaml    |  52 ++++
 .../clock/allwinner,sun9i-a80-apb0-clk.yaml   |  63 +++++
 .../clock/allwinner,sun9i-a80-cpus-clk.yaml   |  52 ++++
 .../clock/allwinner,sun9i-a80-gt-clk.yaml     |  52 ++++
 .../allwinner,sun9i-a80-mmc-config-clk.yaml   |  68 ++++++
 .../clock/allwinner,sun9i-a80-pll4-clk.yaml   |  50 ++++
 .../allwinner,sun9i-a80-usb-mod-clk.yaml      |  60 +++++
 .../allwinner,sun9i-a80-usb-phy-clk.yaml      |  60 +++++
 .../devicetree/bindings/clock/sunxi.txt       | 225 ------------------
 33 files changed, 2163 insertions(+), 225 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ahb-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-apb0-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-apb1-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-axi-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-cpu-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-display-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-gates-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mbus-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mmc-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mod0-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mod1-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-osc-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll1-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll3-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll5-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll6-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-tcon-ch0-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-usb-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ve-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun5i-a13-ahb-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun6i-a31-pll6-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun7i-a20-gmac-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun7i-a20-out-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun8i-h3-bus-gates-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-ahb-clk.yaml
Quoted 9 lines
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-apb0-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-cpus-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-gt-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-mmc-config-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-pll4-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-mod-clk.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-phy-clk.yaml
 delete mode 100644 Documentation/devicetree/bindings/clock/sunxi.txt

Applied, thanks.

Rob