Skip to contentSkip to conversation

dt-bindings: clock: fix some conversion style issues for rockchip,rk3399-cru.yaml

PATCH Applied Johan Jonker 3 participants 10 messages Mar 29, 2022 – Apr 10, 2022

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

PATCH v2 1/6 dt-bindings: clock: fix some conversion style issues for rockchip,rk3399-cru.yaml

With the conversion of rockchip,rk3399-cru.txt a table with external clocks was copied. Make it a bit cleaner by aligning the columns. Also fix a description. Phrases start with a capital.

---
 .../bindings/clock/rockchip,rk3399-cru.yaml        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.yaml +7 -7
index 72b286a1b..76dd24d49 100644
@@ -22,11 +22,11 @@ description: |
   There are several clocks that are generated outside the SoC. It is expected
   that they are defined using standard clock bindings with following
   clock-output-names:
-    - "xin24m" - crystal input - required,
-    - "xin32k" - rtc clock - optional,
-    - "clkin_gmac" - external GMAC clock - optional,
-    - "clkin_i2s" - external I2S clock - optional,
-    - "pclkin_cif" - external ISP clock - optional,
+    - "xin24m"           - crystal input                          - required,
+    - "xin32k"           - rtc clock                              - optional,
+    - "clkin_gmac"       - external GMAC clock                    - optional,
+    - "clkin_i2s"        - external I2S clock                     - optional,
+    - "pclkin_cif"       - external ISP clock                     - optional,
     - "clk_usbphy0_480m" - output clock of the pll in the usbphy0
     - "clk_usbphy1_480m" - output clock of the pll in the usbphy1
 
@@ -62,8 +62,8 @@ properties:
 
   rockchip,grf:
     $ref: /schemas/types.yaml#/definitions/phandle
-    description: >
-      phandle to the syscon managing the "general register files". It is used
+    description:
+      Phandle to the syscon managing the "general register files". It is used
       for GRF muxes, if missing any muxes present in the GRF will not be
       available.
 
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 2/6 dt-bindings: clock: replace a maintainer for rockchip,rk3399-cru.yaml

With the rk3399 cru YAML conversion the original text author was somehow added as a maintainer, but who's currently no longer involved on the subject. Replace this position with the Rockchip clock maintainer on her request.

---
 .../devicetree/bindings/clock/rockchip,rk3399-cru.yaml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.yaml +1 -1
index 76dd24d49..3cc8398fd 100644
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: Rockchip RK3399 Clock and Reset Unit
 
 maintainers:
-  - Xing Zheng <[email protected]>
+  - Elaine Zhang <[email protected]>
   - Heiko Stuebner <[email protected]>
 
 description: |
Signature · 1 line
2.20.1
#2 lore raw

PATCH v2 3/6 dt-bindings: clock: use generic node name for pmucru example in rockchip,rk3399-cru.yaml

In reply to Johan Jonker

The node names should be generic, so fix this for the pmucru node example in the rockchip,rk3399-cru.yaml file and rename it to "clock-controller".

---
 .../devicetree/bindings/clock/rockchip,rk3399-cru.yaml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.yaml +1 -1
index 3cc8398fd..18a009311 100644
@@ -77,7 +77,7 @@ additionalProperties: false
 
 examples:
   - |
-    pmucru: pmu-clock-controller@ff750000 {
+    pmucru: clock-controller@ff750000 {
       compatible = "rockchip,rk3399-pmucru";
       reg = <0xff750000 0x1000>;
       #clock-cells = <1>;
Signature · 1 line
2.20.1
Acked-by on v2 3/6
#3 lore raw

Re: [PATCH v2 3/6] dt-bindings: clock: use generic node name for pmucru example in rockchip, rk3399-cru.yaml

Quoted 13 lines · Johan Jonker

The node names should be generic, so fix this for the pmucru node example in the rockchip,rk3399-cru.yaml file and rename it to "clock-controller".

---
 .../devicetree/bindings/clock/rockchip,rk3399-cru.yaml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.yaml +0 -0
index 3cc8398fd..18a009311 100644

Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.yaml additionalProperties: false · line 77

Quoted 1 line
Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.yaml +0 -0
@@ -77,7 +77,7 @@ additionalProperties: false
 

Best regards,
Krzysztof

#4 lore raw

PATCH v2 4/6 dt-bindings: clock: fix rk3399 cru clock issues

In reply to Johan Jonker

The current rk3399 cru DT node gives warnings like:
'clocks' is a dependency of 'assigned-clocks'.

With the YAML conversion somehow "assigned-xxx" properties where added. If a proper clock is added to the cru node these properties are no longer needed, so removed them. Currently only one clock will be added, so limit the clock maxItems to 1. Add a clock name to be able to differentiate and filter bogus entries.

---
 .../bindings/clock/rockchip,rk3399-cru.yaml       | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)
Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.yaml +3 -12
index 18a009311..54da1e31e 100644
@@ -46,19 +46,10 @@ properties:
     const: 1
 
   clocks:
-    minItems: 1
-
-  assigned-clocks:
-    minItems: 1
-    maxItems: 64
-
-  assigned-clock-parents:
-    minItems: 1
-    maxItems: 64
+    maxItems: 1
 
-  assigned-clock-rates:
-    minItems: 1
-    maxItems: 64
+  clock-names:
+    const: xin24m
 
   rockchip,grf:
     $ref: /schemas/types.yaml#/definitions/phandle
Signature · 1 line
2.20.1
Acked-by on v2 4/6
#5 lore raw

Re: [PATCH v2 4/6] dt-bindings: clock: fix rk3399 cru clock issues

Quoted 9 lines · Johan Jonker

The current rk3399 cru DT node gives warnings like:
'clocks' is a dependency of 'assigned-clocks'.

With the YAML conversion somehow "assigned-xxx" properties where added. If a proper clock is added to the cru node these properties are no longer needed, so removed them. Currently only one clock will be added, so limit the clock maxItems to 1. Add a clock name to be able to differentiate and filter bogus entries.

Quoted 5 lines
---
 .../bindings/clock/rockchip,rk3399-cru.yaml       | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

Best regards,
Krzysztof

#6 lore raw

PATCH v2 5/6 arm64: dts: rockchip: rk3399: use generic node name for pmucru

In reply to Johan Jonker

The node names should be generic, so fix this for the rk3399 pmucru node and rename it to "clock-controller".

---
 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3399.dtsi +1 -1
index 88f26d89e..01c08a2aa 100644
@@ -1413,7 +1413,7 @@
 		clock-names = "apb_pclk";
 	};
 
-	pmucru: pmu-clock-controller@ff750000 {
+	pmucru: clock-controller@ff750000 {
 		compatible = "rockchip,rk3399-pmucru";
 		reg = <0x0 0xff750000 0x0 0x1000>;
 		rockchip,grf = <&pmugrf>;
Signature · 1 line
2.20.1
#7 lore raw

PATCH v2 6/6 arm64: dts: rockchip: add clocks property to cru nodes rk3399

In reply to Johan Jonker

Add clocks property to rk3399 cru nodes to fix warnings like:
'clocks' is a dependency of 'assigned-clocks'.

---

Changed V2:
add clocks to pmucru node

---
 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/rockchip/rk3399.dtsi +4 -0
index 01c08a2aa..56af1a1d6 100644
@@ -1416,6 +1416,8 @@
 	pmucru: clock-controller@ff750000 {
 		compatible = "rockchip,rk3399-pmucru";
 		reg = <0x0 0xff750000 0x0 0x1000>;
+		clocks = <&xin24m>;
+		clock-names = "xin24m";
 		rockchip,grf = <&pmugrf>;
 		#clock-cells = <1>;
 		#reset-cells = <1>;
@@ -1426,6 +1428,8 @@
 	cru: clock-controller@ff760000 {
 		compatible = "rockchip,rk3399-cru";
 		reg = <0x0 0xff760000 0x0 0x1000>;
+		clocks = <&xin24m>;
+		clock-names = "xin24m";
 		rockchip,grf = <&grf>;
 		#clock-cells = <1>;
 		#reset-cells = <1>;
Signature · 1 line
2.20.1
Acked-by on v2 1/6
#8 lore raw

Re: [PATCH v2 1/6] dt-bindings: clock: fix some conversion style issues for rockchip, rk3399-cru.yaml

In reply to Johan Jonker
Quoted 9 lines · Johan Jonker

With the conversion of rockchip,rk3399-cru.txt a table with external clocks was copied. Make it a bit cleaner by aligning the columns. Also fix a description. Phrases start with a capital.

---
 .../bindings/clock/rockchip,rk3399-cru.yaml        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Best regards,
Krzysztof

maintainer Applied
#9 lore raw
In reply to Johan Jonker
Quoted 3 lines · Johan Jonker

With the conversion of rockchip,rk3399-cru.txt a table with external clocks was copied. Make it a bit cleaner by aligning the columns. Also fix a description. Phrases start with a capital.

Applied, thanks!

[1/6] dt-bindings: clock: fix some conversion style issues for rockchip,rk3399-cru.yaml

      commit: 04d3e427148f8ed7322f70e324731c81460671df
[2/6] dt-bindings: clock: replace a maintainer for rockchip,rk3399-cru.yaml
      commit: 50cfde33494072c74bf39a0c281cfa0c3289bd57
[3/6] dt-bindings: clock: use generic node name for pmucru example in rockchip,rk3399-cru.yaml
      commit: 91154f0cd889ed3772a0ac0e24ee363f93fe784c
[4/6] dt-bindings: clock: fix rk3399 cru clock issues
      commit: 7adc1b98bb6e6611bc9122de77737b193b693122
[5/6] arm64: dts: rockchip: rk3399: use generic node name for pmucru
      commit: e03774ff21493f4f82ec7853b33fb3ccc35e4363
[6/6] arm64: dts: rockchip: add clocks property to cru nodes rk3399
      commit: 14fc86b9aa5435bf7dd75839c9a73d9a85a98396

Best regards,

Signature · 1 line
Heiko Stuebner <[email protected]>