* [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3228-cru.txt to YAML
@ 2022-03-30 12:19 Johan Jonker
2022-03-30 12:19 ` [PATCH v1 2/3] ARM: dts: rockchip: add clocks property to cru node rk3228 Johan Jonker
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Johan Jonker @ 2022-03-30 12:19 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,rk3228-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,rk3228-cru.txt | 58 ---------------
.../bindings/clock/rockchip,rk3228-cru.yaml | 74 +++++++++++++++++++
2 files changed, 74 insertions(+), 58 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3228-cru.txt
create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3228-cru.yaml
diff --git a/Documentation/devicetree/bindings/clock/rockchip,rk3228-cru.txt b/Documentation/devicetree/bindings/clock/rockchip,rk3228-cru.txt
deleted file mode 100644
index f32304812..000000000
--- a/Documentation/devicetree/bindings/clock/rockchip,rk3228-cru.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-* Rockchip RK3228 Clock and Reset Unit
-
-The RK3228 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,rk3228-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/rk3228-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,
- - "ext_gmac" - external GMAC clock - optional
- - "ext_hsadc" - external HSADC clock - optional
- - "phy_50m_out" - output clock of the pll in the mac phy
-
-Example: Clock controller node:
-
- cru: cru@20000000 {
- compatible = "rockchip,rk3228-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@10110000 {
- compatible = "snps,dw-apb-uart";
- reg = <0x10110000 0x100>;
- interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
- reg-shift = <2>;
- reg-io-width = <4>;
- clocks = <&cru SCLK_UART0>;
- };
diff --git a/Documentation/devicetree/bindings/clock/rockchip,rk3228-cru.yaml b/Documentation/devicetree/bindings/clock/rockchip,rk3228-cru.yaml
new file mode 100644
index 000000000..cf7dc01d9
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/rockchip,rk3228-cru.yaml
@@ -0,0 +1,74 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/rockchip,rk3228-cru.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Rockchip RK3228 Clock and Reset Unit (CRU)
+
+maintainers:
+ - Elaine Zhang <zhangqing@rock-chips.com>
+ - Heiko Stuebner <heiko@sntech.de>
+
+description: |
+ The RK3228 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/rk3228-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
+ - "ext_gmac" - external GMAC clock - optional
+ - "ext_hsadc" - external HSADC clock - optional
+ - "phy_50m_out" - output clock of the pll in the mac phy
+
+properties:
+ compatible:
+ enum:
+ - rockchip,rk3228-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,rk3228-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 rk3228
2022-03-30 12:19 [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3228-cru.txt to YAML Johan Jonker
@ 2022-03-30 12:19 ` Johan Jonker
2022-03-30 12:19 ` [PATCH v1 3/3] ARM: dts: rockchip: rk322x: 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 12:19 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 rk3228 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/rk322x.dtsi | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index 5868eb512..2547f46fe 100644
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -484,6 +484,8 @@
cru: clock-controller@110e0000 {
compatible = "rockchip,rk3228-cru";
reg = <0x110e0000 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: rk322x: use generic node name for dma
2022-03-30 12:19 [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3228-cru.txt to YAML Johan Jonker
2022-03-30 12:19 ` [PATCH v1 2/3] ARM: dts: rockchip: add clocks property to cru node rk3228 Johan Jonker
@ 2022-03-30 12:19 ` Johan Jonker
2022-03-30 17:33 ` Krzysztof Kozlowski
2022-03-30 17:37 ` [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3228-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 12:19 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 rk3228 dma node
and rename it to "dma-controller".
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---
arch/arm/boot/dts/rk322x.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index 2547f46fe..ffc16d6b9 100644
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -503,7 +503,7 @@
<75000000>;
};
- pdma: pdma@110f0000 {
+ pdma: dma-controller@110f0000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0x110f0000 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 3/3] ARM: dts: rockchip: rk322x: use generic node name for dma
2022-03-30 12:19 ` [PATCH v1 3/3] ARM: dts: rockchip: rk322x: use generic node name for dma Johan Jonker
@ 2022-03-30 17:33 ` Krzysztof Kozlowski
0 siblings, 0 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-30 17:33 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 14:19, Johan Jonker wrote:
> The node names should be generic, so fix this for the rk3228 dma node
> and rename it to "dma-controller".
>
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
> ---
> arch/arm/boot/dts/rk322x.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
Squash it with your other change that type and submit one commit per
sub-arch (so for all arm Rockchips).
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3228-cru.txt to YAML
2022-03-30 12:19 [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3228-cru.txt to YAML Johan Jonker
2022-03-30 12:19 ` [PATCH v1 2/3] ARM: dts: rockchip: add clocks property to cru node rk3228 Johan Jonker
2022-03-30 12:19 ` [PATCH v1 3/3] ARM: dts: rockchip: rk322x: use generic node name for dma Johan Jonker
@ 2022-03-30 17:37 ` Krzysztof Kozlowski
2022-05-17 19:11 ` Heiko Stuebner
3 siblings, 0 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-30 17:37 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 14:19, Johan Jonker wrote:
> Convert rockchip,rk3228-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,rk3228-cru.txt | 58 ---------------
> .../bindings/clock/rockchip,rk3228-cru.yaml | 74 +++++++++++++++++++
> 2 files changed, 74 insertions(+), 58 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3228-cru.txt
> create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3228-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 1/3] dt-bindings: clock: convert rockchip,rk3228-cru.txt to YAML
2022-03-30 12:19 [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3228-cru.txt to YAML Johan Jonker
` (2 preceding siblings ...)
2022-03-30 17:37 ` [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3228-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 14:19:21 +0200, Johan Jonker wrote:
> Convert rockchip,rk3228-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,rk3228-cru.txt to YAML
commit: 5b0c9b98e836724ad826c02f59f7350ddf6466a0
[2/3] ARM: dts: rockchip: add clocks property to cru node rk3228
commit: 36b1b58523b531f60721d42910e4d6fe447c90d5
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:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-30 12:19 [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3228-cru.txt to YAML Johan Jonker
2022-03-30 12:19 ` [PATCH v1 2/3] ARM: dts: rockchip: add clocks property to cru node rk3228 Johan Jonker
2022-03-30 12:19 ` [PATCH v1 3/3] ARM: dts: rockchip: rk322x: use generic node name for dma Johan Jonker
2022-03-30 17:33 ` Krzysztof Kozlowski
2022-03-30 17:37 ` [PATCH v1 1/3] dt-bindings: clock: convert rockchip,rk3228-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).