linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3036-cru.txt to YAML
@ 2022-03-30 11:48 Johan Jonker
  2022-03-30 11:48 ` [PATCH v1 2/3] ARM: dts: rockchip: add clocks property to cru node rk3036 Johan Jonker
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Johan Jonker @ 2022-03-30 11:48 UTC (permalink / raw)
  To: heiko, zhangqing
  Cc: robh+dt, krzk+dt, mturquette, sboyd, linux-clk, devicetree,
	linux-arm-kernel, linux-rockchip, linux-kernel

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.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---
 .../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

diff --git a/Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt b/Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt
deleted file mode 100644
index 20df350b9..000000000
--- a/Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt
+++ /dev/null
@@ -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>;
-	};
diff --git a/Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.yaml b/Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.yaml
new file mode 100644
index 000000000..1376230fe
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.yaml
@@ -0,0 +1,72 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/rockchip,rk3036-cru.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Rockchip RK3036 Clock and Reset Unit (CRU)
+
+maintainers:
+  - Elaine Zhang <zhangqing@rock-chips.com>
+  - Heiko Stuebner <heiko@sntech.de>
+
+description: |
+  The RK3036 clock controller generates and supplies clocks to various
+  controllers within the SoC and also implements a reset controller for SoC
+  peripherals.
+  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.
+  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
+
+properties:
+  compatible:
+    enum:
+      - rockchip,rk3036-cru
+
+  reg:
+    maxItems: 1
+
+  "#clock-cells":
+    const: 1
+
+  "#reset-cells":
+    const: 1
+
+  clocks:
+    maxItems: 1
+
+  clock-names:
+    const: xin24m
+
+  rockchip,grf:
+    $ref: /schemas/types.yaml#/definitions/phandle
+    description:
+      Phandle to the syscon managing the "general register files" (GRF),
+      if missing pll rates are not changeable, due to the missing pll
+      lock status.
+
+required:
+  - compatible
+  - reg
+  - "#clock-cells"
+  - "#reset-cells"
+
+additionalProperties: false
+
+examples:
+  - |
+    cru: clock-controller@20000000 {
+      compatible = "rockchip,rk3036-cru";
+      reg = <0x20000000 0x1000>;
+      rockchip,grf = <&grf>;
+      #clock-cells = <1>;
+      #reset-cells = <1>;
+    };
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v1 2/3] ARM: dts: rockchip: add clocks property to cru node rk3036
  2022-03-30 11:48 [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3036-cru.txt to YAML Johan Jonker
@ 2022-03-30 11:48 ` Johan Jonker
  2022-03-30 11:48 ` [PATCH v1 3/3] ARM: dts: rockchip: rk3036: use generic node name for dma Johan Jonker
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Johan Jonker @ 2022-03-30 11:48 UTC (permalink / raw)
  To: heiko, zhangqing
  Cc: robh+dt, krzk+dt, mturquette, sboyd, linux-clk, devicetree,
	linux-arm-kernel, linux-rockchip, linux-kernel

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

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---
 arch/arm/boot/dts/rk3036.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index ba2b8891b..3894b8d2e 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -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>;
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v1 3/3] ARM: dts: rockchip: rk3036: use generic node name for dma
  2022-03-30 11:48 [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3036-cru.txt to YAML Johan Jonker
  2022-03-30 11:48 ` [PATCH v1 2/3] ARM: dts: rockchip: add clocks property to cru node rk3036 Johan Jonker
@ 2022-03-30 11:48 ` Johan Jonker
  2022-03-30 17:29   ` Krzysztof Kozlowski
  2022-03-30 17:28 ` [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3036-cru.txt to YAML Krzysztof Kozlowski
  2022-05-17 19:11 ` Heiko Stuebner
  3 siblings, 1 reply; 6+ messages in thread
From: Johan Jonker @ 2022-03-30 11:48 UTC (permalink / raw)
  To: heiko, zhangqing
  Cc: robh+dt, krzk+dt, mturquette, sboyd, linux-clk, devicetree,
	linux-arm-kernel, linux-rockchip, linux-kernel

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

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---
 arch/arm/boot/dts/rk3036.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 3894b8d2e..c5aa1636a 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -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>,
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3036-cru.txt to YAML
  2022-03-30 11:48 [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3036-cru.txt to YAML Johan Jonker
  2022-03-30 11:48 ` [PATCH v1 2/3] ARM: dts: rockchip: add clocks property to cru node rk3036 Johan Jonker
  2022-03-30 11:48 ` [PATCH v1 3/3] ARM: dts: rockchip: rk3036: use generic node name for dma Johan Jonker
@ 2022-03-30 17:28 ` Krzysztof Kozlowski
  2022-05-17 19:11 ` Heiko Stuebner
  3 siblings, 0 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-30 17:28 UTC (permalink / raw)
  To: Johan Jonker, heiko, zhangqing
  Cc: robh+dt, krzk+dt, mturquette, sboyd, linux-clk, devicetree,
	linux-arm-kernel, linux-rockchip, linux-kernel

On 30/03/2022 13:48, Johan Jonker wrote:
> 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.
> 
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
> ---
>  .../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
> 


Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>


Best regards,
Krzysztof

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v1 3/3] ARM: dts: rockchip: rk3036: use generic node name for dma
  2022-03-30 11:48 ` [PATCH v1 3/3] ARM: dts: rockchip: rk3036: use generic node name for dma Johan Jonker
@ 2022-03-30 17:29   ` Krzysztof Kozlowski
  0 siblings, 0 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-30 17:29 UTC (permalink / raw)
  To: Johan Jonker, heiko, zhangqing
  Cc: robh+dt, krzk+dt, mturquette, sboyd, linux-clk, devicetree,
	linux-arm-kernel, linux-rockchip, linux-kernel

On 30/03/2022 13:48, Johan Jonker wrote:
> The node names should be generic, so fix this for the rk3036 dma node
> and rename it to "dma-controller".
> 
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
> ---
>  arch/arm/boot/dts/rk3036.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>


Best regards,
Krzysztof

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3036-cru.txt to YAML
  2022-03-30 11:48 [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3036-cru.txt to YAML Johan Jonker
                   ` (2 preceding siblings ...)
  2022-03-30 17:28 ` [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3036-cru.txt to YAML Krzysztof Kozlowski
@ 2022-05-17 19:11 ` Heiko Stuebner
  3 siblings, 0 replies; 6+ messages in thread
From: Heiko Stuebner @ 2022-05-17 19:11 UTC (permalink / raw)
  To: zhangqing, Johan Jonker
  Cc: Heiko Stuebner, linux-clk, linux-kernel, krzk+dt, devicetree,
	linux-arm-kernel, robh+dt, linux-rockchip, mturquette, sboyd

On Wed, 30 Mar 2022 13:48:45 +0200, Johan Jonker wrote:
> 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,
-- 
Heiko Stuebner <heiko@sntech.de>

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-05-17 19:11 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-30 11:48 [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3036-cru.txt to YAML Johan Jonker
2022-03-30 11:48 ` [PATCH v1 2/3] ARM: dts: rockchip: add clocks property to cru node rk3036 Johan Jonker
2022-03-30 11:48 ` [PATCH v1 3/3] ARM: dts: rockchip: rk3036: use generic node name for dma Johan Jonker
2022-03-30 17:29   ` Krzysztof Kozlowski
2022-03-30 17:28 ` [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3036-cru.txt to YAML Krzysztof Kozlowski
2022-05-17 19:11 ` Heiko Stuebner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).