Skip to contentSkip to conversation

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

PATCH Applied Johan Jonker 3 participants 4 messages Mar 29, 2022 – May 17, 2022

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

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

Convert rockchip,rk3308-cru.txt to YAML.

Changes against original bindings:
- Add clocks and clock-names because the device has to have at least one input clock.

---
 .../bindings/clock/rockchip,rk3308-cru.txt    | 60 ---------------
 .../bindings/clock/rockchip,rk3308-cru.yaml   | 76 +++++++++++++++++++
 2 files changed, 76 insertions(+), 60 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3308-cru.txt
 create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3308-cru.yaml
Documentation/devicetree/bindings/clock/rockchip,rk3308-cru.txt deleted +0 -60
deleted file mode 100644
index 9b151c5b0..000000000
@@ -1,60 +0,0 @@
-* Rockchip RK3308 Clock and Reset Unit
-
-The RK3308 clock controller generates and supplies clock to various
-controllers within the SoC and also implements a reset controller for SoC
-peripherals.
-
-Required Properties:
-
-- compatible: CRU should be "rockchip,rk3308-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/rk3308-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,
- - "xin32k" - rtc clock - optional,
- - "mclk_i2s0_8ch_in", "mclk_i2s1_8ch_in", "mclk_i2s2_8ch_in",
-   "mclk_i2s3_8ch_in", "mclk_i2s0_2ch_in",
-   "mclk_i2s1_2ch_in" - external I2S or SPDIF clock - optional,
- - "mac_clkin" - external MAC clock - optional
-
-Example: Clock controller node:
-
-	cru: clock-controller@ff500000 {
-		compatible = "rockchip,rk3308-cru";
-		reg = <0x0 0xff500000 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@ff0a0000 {
-		compatible = "rockchip,rk3308-uart", "snps,dw-apb-uart";
-		reg = <0x0 0xff0a0000 0x0 0x100>;
-		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
-		clock-names = "baudclk", "apb_pclk";
-		reg-shift = <2>;
-		reg-io-width = <4>;
-		status = "disabled";
-	};
Documentation/devicetree/bindings/clock/rockchip,rk3308-cru.yaml new file +76 -0

76 lines not on this page · raw message

Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 arm64: rockchip: add clocks property to cru node rk3308

Add clocks and clock-names to the rk3308 cru node, because the device has to have at least one input clock.
Also in case someone wants to add properties that start with assign-xxx to fix warnings like:
'clocks' is a dependency of 'assigned-clocks'
With the addition of new properties also sort the node properties a little bit.

---
 arch/arm64/boot/dts/rockchip/rk3308.dtsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3308.dtsi +3 -2
index 1cbe21261..2dfa67f1c 100644
@@ -745,10 +745,11 @@
 	cru: clock-controller@ff500000 {
 		compatible = "rockchip,rk3308-cru";
 		reg = <0x0 0xff500000 0x0 0x1000>;
+		clocks = <&xin24m>;
+		clock-names = "xin24m";
+		rockchip,grf = <&grf>;
 		#clock-cells = <1>;
 		#reset-cells = <1>;
-		rockchip,grf = <&grf>;
-
 		assigned-clocks = <&cru SCLK_RTC32K>;
 		assigned-clock-rates = <32768>;
 	};
Signature · 1 line
2.20.1
Reviewed-by on v1 1/2
#2 lore raw

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

In reply to Johan Jonker
Quoted 6 lines · Johan Jonker

Convert rockchip,rk3308-cru.txt to YAML.

Changes against original bindings:
- Add clocks and clock-names because the device has to have at least one input clock.

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

Best regards,
Krzysztof

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

Convert rockchip,rk3308-cru.txt to YAML.

Changes against original bindings:
- Add clocks and clock-names because the device has to have at least one input clock.

Applied, thanks!

[1/2] dt-bindings: clock: convert rockchip,rk3308-cru.txt to YAML

      commit: d87642d72e2921517a01139f33652dbb819a8115
[2/2] arm64: rockchip: add clocks property to cru node rk3308
      commit: d7283a95de1a0e9c1c2a99e1d643fa391010fb0a

Best regards,

Signature · 6 lines
Heiko Stuebner <[email protected]>

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip