Skip to contentSkip to conversation

dt-bindings: clock: convert rockchip,rk3328-cru.txt to YAML

PATCH In review Johan Jonker 2 participants 6 messages Mar 29, 2022

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

PATCH 1/3 dt-bindings: clock: convert rockchip,rk3328-cru.txt to YAML

Current dts files with RK3328 'cru' nodes are manually verified. In order to automate this process rockchip,rk3328-cru.txt has to be converted to YAML.

Changed:
Add properties to fix notifications by clocks.yaml for example:
clocks
clock-names

---
 .../bindings/clock/rockchip,rk3328-cru.txt    | 58 ---------------
 .../bindings/clock/rockchip,rk3328-cru.yaml   | 74 +++++++++++++++++++
 2 files changed, 74 insertions(+), 58 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.txt
 create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.yaml
Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.txt deleted +0 -58
deleted file mode 100644
index 904ae682e..000000000
@@ -1,58 +0,0 @@
-* Rockchip RK3328 Clock and Reset Unit
-
-The RK3328 clock controller generates and supplies clock to various
-controllers within the SoC and also implements a reset controller for SoC
-peripherals.
-
-Required Properties:
-
-- compatible: should be "rockchip,rk3328-cru"
-- reg: physical base address of the controller and length of memory mapped
-  region.
-- #clock-cells: should be 1.
-- #reset-cells: should be 1.
-
-Optional Properties:
-
-- rockchip,grf: phandle to the syscon managing the "general register files"
-  If missing pll rates are not changeable, due to the missing pll lock status.
-
-Each clock is assigned an identifier and client nodes can use this identifier
-to specify the clock which they consume. All available clocks are defined as
-preprocessor macros in the dt-bindings/clock/rk3328-cru.h headers and can be
-used in device tree sources. Similar macros exist for the reset sources in
-these files.
-
-External clocks:
-
-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,
- - "clkin_i2s" - external I2S clock - optional,
- - "gmac_clkin" - external GMAC clock - optional
- - "phy_50m_out" - output clock of the pll in the mac phy
- - "hdmi_phy" - output clock of the hdmi phy pll - optional
-
-Example: Clock controller node:
-
-	cru: clock-controller@ff440000 {
-		compatible = "rockchip,rk3328-cru";
-		reg = <0x0 0xff440000 0x0 0x1000>;
-		rockchip,grf = <&grf>;
-
-		#clock-cells = <1>;
-		#reset-cells = <1>;
-	};
-
-Example: UART controller node that consumes the clock generated by the clock
-  controller:
-
-	uart0: serial@ff120000 {
-		compatible = "snps,dw-apb-uart";
-		reg = <0xff120000 0x100>;
-		interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
-		reg-shift = <2>;
-		reg-io-width = <4>;
-		clocks = <&cru SCLK_UART0>;
-	};
Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.yaml new file +74 -0

74 lines not on this page · raw message

Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/3 arm64: dts: rockchip: fix compatible string rk3328 cru node

The rockchip,rk3328-cru.txt file was converted to YAML. A DT test of the rk3328 cru node gives notifications regarding the compatible string. Bring it in line with the binding by removing some unused fall back strings.

---
 arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3328.dtsi +1 -1
index b822533dc..73418fd2f 100644
@@ -756,7 +756,7 @@
 	};
 
 	cru: clock-controller@ff440000 {
-		compatible = "rockchip,rk3328-cru", "rockchip,cru", "syscon";
+		compatible = "rockchip,rk3328-cru";
 		reg = <0x0 0xff440000 0x0 0x1000>;
 		rockchip,grf = <&grf>;
 		#clock-cells = <1>;
Signature · 1 line
2.20.1
#2 lore raw

Re: [PATCH v1 2/3] arm64: dts: rockchip: fix compatible string rk3328 cru node

Quoted 4 lines · Johan Jonker

The rockchip,rk3328-cru.txt file was converted to YAML. A DT test of the rk3328 cru node gives notifications regarding the compatible string. Bring it in line with the binding by removing some unused fall back strings.

Are you sure these are unused? rockchip,cru maybe, but what about DTS used out of tree? It's useful to mention that the compatible is not documented (so if there are any out of tree users, it's their fault).

Removal of syscon is different case - why do you think it is unused? Did you check it? It's not a fallback compatible.

Quoted 11 lines
---
 arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3328.dtsi +0 -0
index b822533dc..73418fd2f 100644

arch/arm64/boot/dts/rockchip/rk3328.dtsi line 762

Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3328.dtsi +1 -1
@@ -756,7 +756,7 @@
 	};
 
 	cru: clock-controller@ff440000 {
-		compatible = "rockchip,rk3328-cru", "rockchip,cru", "syscon";
+		compatible = "rockchip,rk3328-cru";
 		reg = <0x0 0xff440000 0x0 0x1000>;
 		rockchip,grf = <&grf>;
 		#clock-cells = <1>;

Best regards,
Krzysztof

#3 lore raw

Re: [PATCH v1 2/3] arm64: dts: rockchip: fix compatible string rk3328 cru node

Quoted 7 lines · Krzysztof Kozlowski
Quoted 4 lines · Johan Jonker

The rockchip,rk3328-cru.txt file was converted to YAML. A DT test of the rk3328 cru node gives notifications regarding the compatible string. Bring it in line with the binding by removing some unused fall back strings.

Quoted 6 lines

Are you sure these are unused? rockchip,cru maybe, but what about DTS used out of tree? It's useful to mention that the compatible is not documented (so if there are any out of tree users, it's their fault).

Removal of syscon is different case - why do you think it is unused? Did you check it? It's not a fallback compatible.

Hi,

If someone knows why that was added to the Rockchip tree? Let us know.(Elaine ??)
Other well know locations don't seem to use it.

Please advise.

Johan
===

https://github.com/torvalds/linux/search?q=rockchip%2Ccru&type=code

https://source.denx.de/search?search=rockchip%2Ccru&group_id=325&project_id=540&scope=&search_code=true&snippets=false&repository_ref=master&nav_source=navbar

https://github.com/rockchip-linux/kernel/search?q=rockchip%2Ccru&type=code

Quoted 24 lines
Quoted 12 lines
---
 arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3328.dtsi +0 -0
index b822533dc..73418fd2f 100644

arch/arm64/boot/dts/rockchip/rk3328.dtsi line 762

Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3328.dtsi +1 -1
@@ -756,7 +756,7 @@
 	};
 
 	cru: clock-controller@ff440000 {
-		compatible = "rockchip,rk3328-cru", "rockchip,cru", "syscon";
+		compatible = "rockchip,rk3328-cru";
 		reg = <0x0 0xff440000 0x0 0x1000>;
 		rockchip,grf = <&grf>;
 		#clock-cells = <1>;

Best regards,
Krzysztof

#4 lore raw

PATCH 3/3 arm64: rockchip: add clocks property to cru node rk3328

In reply to Johan Jonker

Add clocks property to rk3328 cru node to fix warnings like:
'clocks' is a dependency of 'assigned-clocks'

---
 arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/rockchip/rk3328.dtsi +2 -0
index 73418fd2f..8ceac0388 100644
@@ -758,6 +758,8 @@
 	cru: clock-controller@ff440000 {
 		compatible = "rockchip,rk3328-cru";
 		reg = <0x0 0xff440000 0x0 0x1000>;
+		clocks = <&xin24m>;
+		clock-names = "xin24m";
 		rockchip,grf = <&grf>;
 		#clock-cells = <1>;
 		#reset-cells = <1>;
Signature · 1 line
2.20.1
Reviewed-by on v1 1/3
#5 lore raw

Re: [PATCH v1 1/3] dt-bindings: clock: convert rockchip, rk3328-cru.txt to YAML

In reply to Johan Jonker
Quoted 3 lines · Johan Jonker

Current dts files with RK3328 'cru' nodes are manually verified. In order to automate this process rockchip,rk3328-cru.txt has to be converted to YAML.

You know that this can be one or two lines max? "Convert RK3328 clock controller bindings to DT schema"

It's equal, because we all know the benefits of DT schema. :)

Quoted 5 lines

Changed:
Add properties to fix notifications by clocks.yaml for example:
clocks
clock-names

Quoted 8 lines
---
 .../bindings/clock/rockchip,rk3328-cru.txt    | 58 ---------------
 .../bindings/clock/rockchip,rk3328-cru.yaml   | 74 +++++++++++++++++++
 2 files changed, 74 insertions(+), 58 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.txt
 create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.yaml

Best regards,
Krzysztof