Skip to contentSkip to conversation

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

PATCH Applied Johan Jonker 3 participants 6 messages Mar 30, 2022 – May 17, 2022

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

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

Convert rockchip,rk3036-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,rk3036-cru.txt    | 56 ---------------
 .../bindings/clock/rockchip,rk3036-cru.yaml   | 72 +++++++++++++++++++
 2 files changed, 72 insertions(+), 56 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt
 create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.yaml
Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt deleted +0 -56
deleted file mode 100644
index 20df350b9..000000000
@@ -1,56 +0,0 @@
-* Rockchip RK3036 Clock and Reset Unit
-
-The RK3036 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,rk3036-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/rk3036-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,
- - "ext_i2s" - external I2S clock - optional,
- - "rmii_clkin" - external EMAC clock - optional
-
-Example: Clock controller node:
-
-	cru: cru@20000000 {
-		compatible = "rockchip,rk3036-cru";
-		reg = <0x20000000 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@20060000 {
-		compatible = "snps,dw-apb-uart";
-		reg = <0x20060000 0x100>;
-		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
-		reg-shift = <2>;
-		reg-io-width = <4>;
-		clocks = <&cru SCLK_UART0>;
-	};
Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.yaml new file +72 -0

72 lines not on this page · raw message

Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/3 ARM: dts: rockchip: add clocks property to cru node rk3036

Add clocks and clock-names to the rk3036 cru node, because the device has to have at least one input clock.

---
 arch/arm/boot/dts/rk3036.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/boot/dts/rk3036.dtsi +2 -0
index ba2b8891b..3894b8d2e 100644
@@ -330,6 +330,8 @@
 	cru: clock-controller@20000000 {
 		compatible = "rockchip,rk3036-cru";
 		reg = <0x20000000 0x1000>;
+		clocks = <&xin24m>;
+		clock-names = "xin24m";
 		rockchip,grf = <&grf>;
 		#clock-cells = <1>;
 		#reset-cells = <1>;
Signature · 1 line
2.20.1
#2 lore raw

PATCH 3/3 ARM: dts: rockchip: rk3036: use generic node name for dma

In reply to Johan Jonker

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

---
 arch/arm/boot/dts/rk3036.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/rk3036.dtsi +1 -1
index 3894b8d2e..c5aa1636a 100644
@@ -558,7 +558,7 @@
 		status = "disabled";
 	};
 
-	pdma: pdma@20078000 {
+	pdma: dma-controller@20078000 {
 		compatible = "arm,pl330", "arm,primecell";
 		reg = <0x20078000 0x4000>;
 		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
Signature · 1 line
2.20.1
Reviewed-by on v1 1/3
#4 lore raw
In reply to Johan Jonker
Quoted 6 lines · Johan Jonker

Convert rockchip,rk3036-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,rk3036-cru.txt    | 56 ---------------
 .../bindings/clock/rockchip,rk3036-cru.yaml   | 72 +++++++++++++++++++
 2 files changed, 72 insertions(+), 56 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt
 create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.yaml

Best regards,
Krzysztof

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

Convert rockchip,rk3036-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/3] dt-bindings: clock: convert rockchip,rk3036-cru.txt to YAML

      commit: de55d1639067b9dd4986bb4885c41867d085defa
[2/3] ARM: dts: rockchip: add clocks property to cru node rk3036
      commit: b35fd1af63ffbad76292495d0fd0deefba414a85

Best regards,

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