2022-03-26 17:05:13

by Johan Jonker

Subject: [PATCH v1 1/3] dt-bindings: clock: fix some conversion issues for rockchip,rk3399-cru.yaml

With the conversion of rockchip,rk3399-cru.txt some issues were added,
so fix them:

Changed:
Align the table with external clocks.
Remove the original author in 2016 as maintainer.
Change clocks maxItems.
Add clock-names.
Use clock-controller node name in example.
Remove assigned-xxx.
Remove ">" from description.

Signed-off-by: Johan Jonker <[email protected]>
---
.../bindings/clock/rockchip,rk3399-cru.yaml | 32 +++++++------------
1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.yaml b/Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.yaml
index 72b286a1b..c2763e694 100644
--- a/Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.yaml
+++ b/Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.yaml
@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Rockchip RK3399 Clock and Reset Unit

maintainers:
- - Xing Zheng <[email protected]>
- Heiko Stuebner <[email protected]>

description: |
@@ -22,11 +21,11 @@ description: |
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,
- - "clkin_gmac" - external GMAC clock - optional,
- - "clkin_i2s" - external I2S clock - optional,
- - "pclkin_cif" - external ISP clock - optional,
+ - "xin24m" - crystal input - required,
+ - "xin32k" - rtc clock - optional,
+ - "clkin_gmac" - external GMAC clock - optional,
+ - "clkin_i2s" - external I2S clock - optional,
+ - "pclkin_cif" - external ISP clock - optional,
- "clk_usbphy0_480m" - output clock of the pll in the usbphy0
- "clk_usbphy1_480m" - output clock of the pll in the usbphy1

@@ -46,24 +45,15 @@ properties:
const: 1

clocks:
- minItems: 1
-
- assigned-clocks:
- minItems: 1
- maxItems: 64
-
- assigned-clock-parents:
- minItems: 1
- maxItems: 64
+ maxItems: 1

- assigned-clock-rates:
- minItems: 1
- maxItems: 64
+ clock-names:
+ const: xin24m

rockchip,grf:
$ref: /schemas/types.yaml#/definitions/phandle
- description: >
- phandle to the syscon managing the "general register files". It is used
+ description:
+ Phandle to the syscon managing the "general register files". It is used
for GRF muxes, if missing any muxes present in the GRF will not be
available.

@@ -77,7 +67,7 @@ additionalProperties: false

examples:
- |
- pmucru: pmu-clock-controller@ff750000 {
+ pmucru: clock-controller@ff750000 {
compatible = "rockchip,rk3399-pmucru";
reg = <0xff750000 0x1000>;
#clock-cells = <1>;
--
2.20.1

2022-03-26 18:40:06

by Johan Jonker

Subject: [PATCH v1 2/3] arm64: dts: rockchip: rk3399: use generic pmucru nodename

The cru nodenames should be generic,
so fix this for the pmucru node.

Signed-off-by: Johan Jonker <[email protected]>
---
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 88f26d89e..01c08a2aa 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1413,7 +1413,7 @@
clock-names = "apb_pclk";
};

- pmucru: pmu-clock-controller@ff750000 {
+ pmucru: clock-controller@ff750000 {
compatible = "rockchip,rk3399-pmucru";
reg = <0x0 0xff750000 0x0 0x1000>;
rockchip,grf = <&pmugrf>;
--
2.20.1

2022-03-28 01:02:20

by Krzysztof Kozlowski

Subject: Re: [PATCH v1 2/3] arm64: dts: rockchip: rk3399: use generic pmucru nodename

On 26/03/2022 11:27, Johan Jonker wrote:
> The cru nodenames should be generic,

"The node names"

> so fix this for the pmucru node.

Wrap description like in our coding style:
https://elixir.bootlin.com/linux/v5.13/source/Documentation/process/submitting-patches.rst#L588


Best regards,
Krzysztof

2022-03-28 16:45:06

by Krzysztof Kozlowski

Subject: Re: [PATCH v1 1/3] dt-bindings: clock: fix some conversion issues for rockchip,rk3399-cru.yaml

On 26/03/2022 11:27, Johan Jonker wrote:
> With the conversion of rockchip,rk3399-cru.txt some issues were added,
> so fix them:
>
> Changed:
> Align the table with external clocks.
> Remove the original author in 2016 as maintainer.

This requires explanation.

> Change clocks maxItems.

This requires explanation. There is no maxItems in clocks.

> Add clock-names.
> Use clock-controller node name in example.

Why?

> Remove assigned-xxx.
> Remove ">" from description.

All this should be around two or three commits, so you need to split
changes which are cleanups to changes affecting functionality (adding
new properties, changing values).

>
> Signed-off-by: Johan Jonker <[email protected]>
> ---
> .../bindings/clock/rockchip,rk3399-cru.yaml | 32 +++++++------------
> 1 file changed, 11 insertions(+), 21 deletions(-)
>


Best regards,
Krzysztof