Convert Rockchip clk
Subsystems (3)
v4 cover Convert Rockchip clk
Combined serie of previously converted Rockchip clk bindings.
Changed V4:
combine dts patches
add more clocks
add clocks to example
add clocks requirement
Johan Jonker (16):
dt-bindings: clock: convert rockchip,px30-cru.txt to YAML
dt-bindings: clock: convert rockchip,rk3036-cru.txt to YAML
dt-bindings: clock: convert rockchip,rk3188-cru.txt to YAML
dt-bindings: clock: convert rockchip,rk3228-cru.txt to YAML
dt-bindings: clock: convert rockchip,rk3288-cru.txt to YAML
dt-bindings: clock: convert rockchip,rk3308-cru.txt to YAML
dt-bindings: clock: convert rockchip,rk3328-cru.txt to YAML
dt-bindings: clock: convert rockchip,rk3368-cru.txt to YAML
dt-bindings: clock: convert rockchip,rv1108-cru.txt to YAML
ARM: dts: rockchip: add clocks property to Rockchip cru nodes
arm64: dts: rockchip: add clocks property to Rockchip cru nodes
arm64: dts: rockchip: rk3399: use generic node name for pmucru
arm64: dts: rockchip: fix compatible string rk3328 cru node
dt-bindings: clock: replace a maintainer for rockchip,rk3399-cru.yaml
dt-bindings: clock: use generic node name for pmucru example in
rockchip,rk3399-cru.yaml
dt-bindings: clock: fix some conversion clock issues for
rockchip,rk3399-cru.yaml.../bindings/clock/rockchip,px30-cru.txt | 70 ---------- .../bindings/clock/rockchip,px30-cru.yaml | 120 ++++++++++++++++++ .../bindings/clock/rockchip,rk3036-cru.txt | 56 -------- .../bindings/clock/rockchip,rk3036-cru.yaml | 80 ++++++++++++ .../bindings/clock/rockchip,rk3188-cru.txt | 61 --------- .../bindings/clock/rockchip,rk3188-cru.yaml | 86 +++++++++++++ .../bindings/clock/rockchip,rk3228-cru.txt | 58 --------- .../bindings/clock/rockchip,rk3228-cru.yaml | 82 ++++++++++++ .../bindings/clock/rockchip,rk3288-cru.txt | 67 ---------- .../bindings/clock/rockchip,rk3288-cru.yaml | 93 ++++++++++++++ .../bindings/clock/rockchip,rk3308-cru.txt | 60 --------- .../bindings/clock/rockchip,rk3308-cru.yaml | 86 +++++++++++++ .../bindings/clock/rockchip,rk3328-cru.txt | 58 --------- .../bindings/clock/rockchip,rk3328-cru.yaml | 82 ++++++++++++ .../bindings/clock/rockchip,rk3368-cru.txt | 61 --------- .../bindings/clock/rockchip,rk3368-cru.yaml | 86 +++++++++++++ .../bindings/clock/rockchip,rk3399-cru.yaml | 59 ++++----- .../bindings/clock/rockchip,rv1108-cru.txt | 59 --------- .../bindings/clock/rockchip,rv1108-cru.yaml | 83 ++++++++++++ arch/arm/boot/dts/rk3036.dtsi | 2 + arch/arm/boot/dts/rk3066a.dtsi | 3 +- arch/arm/boot/dts/rk3188.dtsi | 3 +- arch/arm/boot/dts/rk322x.dtsi | 2 + arch/arm/boot/dts/rk3288.dtsi | 2 + arch/arm/boot/dts/rv1108.dtsi | 2 + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 5 +- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 +- arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 +- 29 files changed, 853 insertions(+), 585 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,px30-cru.txt create mode 100644 Documentation/devicetree/bindings/clock/rockchip,px30-cru.yaml delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.yaml delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3188-cru.txt create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3188-cru.yaml delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3228-cru.txt create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3228-cru.yaml delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3288-cru.txt create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3288-cru.yaml delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3308-cru.txt create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3308-cru.yaml delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.txt create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.yaml delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3368-cru.txt create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3368-cru.yaml delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rv1108-cru.txt create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rv1108-cru.yaml
Signature · 1 line
2.20.1
PATCH v4 1/16 dt-bindings: clock: convert rockchip,px30-cru.txt to YAML
Convert rockchip,px30-cru.txt to YAML.
Changes against original bindings:
Use compatible string: "rockchip,px30-pmucru"
---
Changed V4:
add more clocks
Changed V2:
add allOf:if:then: constraining
--- .../bindings/clock/rockchip,px30-cru.txt | 70 ---------- .../bindings/clock/rockchip,px30-cru.yaml | 120 ++++++++++++++++++ 2 files changed, 120 insertions(+), 70 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,px30-cru.txt create mode 100644 Documentation/devicetree/bindings/clock/rockchip,px30-cru.yaml
Documentation/devicetree/bindings/clock/rockchip,px30-cru.txt deleted +0 -70
@@ -1,70 +0,0 @@ -* Rockchip PX30 Clock and Reset Unit - -The PX30 clock controller generates and supplies clock to various -controllers within the SoC and also implements a reset controller for SoC -peripherals. - -Required Properties: - -- compatible: PMU for CRU should be "rockchip,px30-pmu-cru" -- compatible: CRU should be "rockchip,px30-cru" -- reg: physical base address of the controller and length of memory mapped - region. -- clocks: A list of phandle + clock-specifier pairs for the clocks listed - in clock-names -- clock-names: Should contain the following: - - "xin24m" for both PMUCRU and CRU - - "gpll" for CRU (sourced from PMUCRU) -- #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/px30-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, - - "i2sx_clkin" - external I2S clock - optional, - - "gmac_clkin" - external GMAC clock - optional - -Example: Clock controller node: - - pmucru: clock-controller@ff2bc000 { - compatible = "rockchip,px30-pmucru"; - reg = <0x0 0xff2bc000 0x0 0x1000>; - #clock-cells = <1>; - #reset-cells = <1>; - }; - - cru: clock-controller@ff2b0000 { - compatible = "rockchip,px30-cru"; - reg = <0x0 0xff2b0000 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@ff030000 { - compatible = "rockchip,px30-uart", "snps,dw-apb-uart"; - reg = <0x0 0xff030000 0x0 0x100>; - interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&pmucru SCLK_UART0_PMU>, <&pmucru PCLK_UART0_PMU>; - clock-names = "baudclk", "apb_pclk"; - reg-shift = <2>; - reg-io-width = <4>; - };
Documentation/devicetree/bindings/clock/rockchip,px30-cru.yaml new file +120 -0
120 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v4 2/16 dt-bindings: clock: convert rockchip,rk3036-cru.txt to YAML
In reply to Johan JonkerConvert 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.
---
Changed V4:
add more clocks
add clocks to example
add clocks requirement
--- .../bindings/clock/rockchip,rk3036-cru.txt | 56 ------------- .../bindings/clock/rockchip,rk3036-cru.yaml | 80 +++++++++++++++++++ 2 files changed, 80 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
@@ -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 +80 -0
80 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v4 3/16 dt-bindings: clock: convert rockchip,rk3188-cru.txt to YAML
In reply to Johan JonkerConvert rockchip,rk3188-cru.txt to YAML.
Changes against original bindings:
Add clocks and clock-names because the device has to have at least one input clock.
---
Changed V4:
add more clocks
add clocks to example
add clocks requirement
Changed V3:
add Rockchip maintainer on her request
fix yamllint line too long
Changed V2:
change clocks maxItems
add clock-names
use clock-controller node name
remove assigned-xxx
--- .../bindings/clock/rockchip,rk3188-cru.txt | 61 ------------- .../bindings/clock/rockchip,rk3188-cru.yaml | 86 +++++++++++++++++++ 2 files changed, 86 insertions(+), 61 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3188-cru.txt create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3188-cru.yaml
Documentation/devicetree/bindings/clock/rockchip,rk3188-cru.txt deleted +0 -61
@@ -1,61 +0,0 @@ -* Rockchip RK3188/RK3066 Clock and Reset Unit - -The RK3188/RK3066 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,rk3188-cru", "rockchip,rk3188a-cru" or - "rockchip,rk3066a-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/rk3188-cru.h and -dt-bindings/clock/rk3066-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, - - "xin27m" - 27mhz crystal input on rk3066 - optional, - - "ext_hsadc" - external HSADC clock - optional, - - "ext_cif0" - external camera clock - optional, - - "ext_rmii" - external RMII clock - optional, - - "ext_jtag" - externalJTAG clock - optional - -Example: Clock controller node: - - cru: cru@20000000 { - compatible = "rockchip,rk3188-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@10124000 { - compatible = "snps,dw-apb-uart"; - reg = <0x10124000 0x400>; - interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; - reg-shift = <2>; - reg-io-width = <1>; - clocks = <&cru SCLK_UART0>; - };
Documentation/devicetree/bindings/clock/rockchip,rk3188-cru.yaml new file +86 -0
86 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v4 4/16 dt-bindings: clock: convert rockchip,rk3228-cru.txt to YAML
In reply to Johan JonkerConvert 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.
---
Changed V4:
add more clocks
add clocks to example
add clocks requirement
--- .../bindings/clock/rockchip,rk3228-cru.txt | 58 ------------- .../bindings/clock/rockchip,rk3228-cru.yaml | 82 +++++++++++++++++++ 2 files changed, 82 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
Documentation/devicetree/bindings/clock/rockchip,rk3228-cru.txt deleted +0 -58
@@ -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>; - };
Documentation/devicetree/bindings/clock/rockchip,rk3228-cru.yaml new file +82 -0
82 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v4 5/16 dt-bindings: clock: convert rockchip,rk3288-cru.txt to YAML
In reply to Johan JonkerConvert rockchip,rk3288-cru.txt to YAML.
Changes against original bindings:
Add clocks and clock-names because the device has to have at least one input clock.
---
Changed V4:
add more clocks
add clocks to example
add clocks requirement
Changed V2:
add Rockchip maintainer on her request
fix yamllint line too long
restyle
--- .../bindings/clock/rockchip,rk3288-cru.txt | 67 ------------- .../bindings/clock/rockchip,rk3288-cru.yaml | 93 +++++++++++++++++++ 2 files changed, 93 insertions(+), 67 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3288-cru.txt create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3288-cru.yaml
Documentation/devicetree/bindings/clock/rockchip,rk3288-cru.txt deleted +0 -67
@@ -1,67 +0,0 @@ -* Rockchip RK3288 Clock and Reset Unit - -The RK3288 clock controller generates and supplies clock to various -controllers within the SoC and also implements a reset controller for SoC -peripherals. - -A revision of this SoC is available: rk3288w. The clock tree is a bit -different so another dt-compatible is available. Noticed that it is only -setting the difference but there is no automatic revision detection. This -should be performed by bootloaders. - -Required Properties: - -- compatible: should be "rockchip,rk3288-cru" or "rockchip,rk3288w-cru" in - case of this revision of Rockchip rk3288. -- 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/rk3288-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, - - "ext_i2s" - external I2S clock - optional, - - "ext_hsadc" - external HSADC clock - optional, - - "ext_edp_24m" - external display port clock - optional, - - "ext_vip" - external VIP clock - optional, - - "ext_isp" - external ISP clock - optional, - - "ext_jtag" - external JTAG clock - optional - -Example: Clock controller node: - - cru: cru@20000000 { - compatible = "rockchip,rk3188-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@10124000 { - compatible = "snps,dw-apb-uart"; - reg = <0x10124000 0x400>; - interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; - reg-shift = <2>; - reg-io-width = <1>; - clocks = <&cru SCLK_UART0>; - };
Documentation/devicetree/bindings/clock/rockchip,rk3288-cru.yaml new file +93 -0
93 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v4 6/16 dt-bindings: clock: convert rockchip,rk3308-cru.txt to YAML
In reply to Johan JonkerConvert 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.
---
Changed V4:
add more clocks
add clocks to example
add clocks requirement
--- .../bindings/clock/rockchip,rk3308-cru.txt | 60 ------------- .../bindings/clock/rockchip,rk3308-cru.yaml | 86 +++++++++++++++++++ 2 files changed, 86 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
@@ -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 +86 -0
86 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v4 7/16 dt-bindings: clock: convert rockchip,rk3328-cru.txt to YAML
In reply to Johan JonkerConvert rockchip,rk3328-cru.txt to YAML.
Changes against original bindings:
Add clocks and clock-names because the device has to have at least one input clock.
---
Changed V4:
add more clocks
add clocks to example
add clocks requirement
--- .../bindings/clock/rockchip,rk3328-cru.txt | 58 ------------- .../bindings/clock/rockchip,rk3328-cru.yaml | 82 +++++++++++++++++++ 2 files changed, 82 insertions(+), 58 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.txt create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.yaml
Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.txt deleted +0 -58
@@ -1,58 +0,0 @@ -* Rockchip RK3328 Clock and Reset Unit - -The RK3328 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,rk3328-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/rk3328-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, - - "clkin_i2s" - external I2S clock - optional, - - "gmac_clkin" - external GMAC clock - optional - - "phy_50m_out" - output clock of the pll in the mac phy - - "hdmi_phy" - output clock of the hdmi phy pll - optional - -Example: Clock controller node: - - cru: clock-controller@ff440000 { - compatible = "rockchip,rk3328-cru"; - reg = <0x0 0xff440000 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@ff120000 { - compatible = "snps,dw-apb-uart"; - reg = <0xff120000 0x100>; - interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>; - reg-shift = <2>; - reg-io-width = <4>; - clocks = <&cru SCLK_UART0>; - };
Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.yaml new file +82 -0
82 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v4 8/16 dt-bindings: clock: convert rockchip,rk3368-cru.txt to YAML
In reply to Johan JonkerConvert rockchip,rk3368-cru.txt to YAML.
Changes against original bindings:
Add clocks and clock-names because the device has to have at least one input clock.
---
Changed V4:
add more clocks
add clocks to example
add clocks requirement
--- .../bindings/clock/rockchip,rk3368-cru.txt | 61 ------------- .../bindings/clock/rockchip,rk3368-cru.yaml | 86 +++++++++++++++++++ 2 files changed, 86 insertions(+), 61 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3368-cru.txt create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3368-cru.yaml
Documentation/devicetree/bindings/clock/rockchip,rk3368-cru.txt deleted +0 -61
@@ -1,61 +0,0 @@ -* Rockchip RK3368 Clock and Reset Unit - -The RK3368 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,rk3368-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/rk3368-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, - - "ext_i2s" - external I2S clock - optional, - - "ext_gmac" - external GMAC clock - optional - - "ext_hsadc" - external HSADC clock - optional, - - "ext_isp" - external ISP clock - optional, - - "ext_jtag" - external JTAG clock - optional - - "ext_vip" - external VIP clock - optional, - - "usbotg_out" - output clock of the pll in the otg phy - -Example: Clock controller node: - - cru: clock-controller@ff760000 { - compatible = "rockchip,rk3368-cru"; - reg = <0x0 0xff760000 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@10124000 { - compatible = "snps,dw-apb-uart"; - reg = <0x10124000 0x400>; - interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; - reg-shift = <2>; - reg-io-width = <1>; - clocks = <&cru SCLK_UART0>; - };
Documentation/devicetree/bindings/clock/rockchip,rk3368-cru.yaml new file +86 -0
86 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v4 9/16 dt-bindings: clock: convert rockchip,rv1108-cru.txt to YAML
In reply to Johan JonkerConvert rockchip,rv1108-cru.txt to YAML.
Changes against original bindings:
Add clocks and clock-names because the device has to have at least one input clock.
---
Changed V4:
add more clocks
add clocks to example
add clocks requirement
--- .../bindings/clock/rockchip,rv1108-cru.txt | 59 ------------- .../bindings/clock/rockchip,rv1108-cru.yaml | 83 +++++++++++++++++++ 2 files changed, 83 insertions(+), 59 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rv1108-cru.txt create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rv1108-cru.yaml
Documentation/devicetree/bindings/clock/rockchip,rv1108-cru.txt deleted +0 -59
@@ -1,59 +0,0 @@ -* Rockchip RV1108 Clock and Reset Unit - -The RV1108 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,rv1108-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/rv1108-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_vip" - external VIP clock - optional - - "ext_i2s" - external I2S clock - optional - - "ext_gmac" - external GMAC clock - optional - - "hdmiphy" - external clock input derived from HDMI PHY - optional - - "usbphy" - external clock input derived from USB PHY - optional - -Example: Clock controller node: - - cru: cru@20200000 { - compatible = "rockchip,rv1108-cru"; - reg = <0x20200000 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@10230000 { - compatible = "rockchip,rv1108-uart", "snps,dw-apb-uart"; - reg = <0x10230000 0x100>; - interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; - reg-shift = <2>; - reg-io-width = <4>; - clocks = <&cru SCLK_UART0>; - };
Documentation/devicetree/bindings/clock/rockchip,rv1108-cru.yaml new file +83 -0
83 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v4 10/16 ARM: dts: rockchip: add clocks property to Rockchip cru nodes
In reply to Johan JonkerAdd clocks and clock-names to the Rockchip cru nodes, because the device has to have at least one input clock.
---
Changed V4:
combine patches
--- arch/arm/boot/dts/rk3036.dtsi | 2 ++ arch/arm/boot/dts/rk3066a.dtsi | 3 ++- arch/arm/boot/dts/rk3188.dtsi | 3 ++- arch/arm/boot/dts/rk322x.dtsi | 2 ++ arch/arm/boot/dts/rk3288.dtsi | 2 ++ arch/arm/boot/dts/rv1108.dtsi | 2 ++ 6 files changed, 12 insertions(+), 2 deletions(-)
arch/arm/boot/dts/rk3036.dtsi +2 -0
@@ -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>;
arch/arm/boot/dts/rk3066a.dtsi +2 -1
@@ -202,8 +202,9 @@ cru: clock-controller@20000000 { compatible = "rockchip,rk3066a-cru"; reg = <0x20000000 0x1000>; + clocks = <&xin24m>; + clock-names = "xin24m"; rockchip,grf = <&grf>; - #clock-cells = <1>; #reset-cells = <1>; assigned-clocks = <&cru PLL_CPLL>, <&cru PLL_GPLL>,
arch/arm/boot/dts/rk3188.dtsi +2 -1
@@ -195,8 +195,9 @@ cru: clock-controller@20000000 { compatible = "rockchip,rk3188-cru"; reg = <0x20000000 0x1000>; + clocks = <&xin24m>; + clock-names = "xin24m"; rockchip,grf = <&grf>; - #clock-cells = <1>; #reset-cells = <1>; };
arch/arm/boot/dts/rk322x.dtsi +2 -0
@@ -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>;
arch/arm/boot/dts/rk3288.dtsi +2 -0
@@ -862,6 +862,8 @@ cru: clock-controller@ff760000 { compatible = "rockchip,rk3288-cru"; reg = <0x0 0xff760000 0x0 0x1000>; + clocks = <&xin24m>; + clock-names = "xin24m"; rockchip,grf = <&grf>; #clock-cells = <1>; #reset-cells = <1>;
arch/arm/boot/dts/rv1108.dtsi +2 -0
@@ -456,6 +456,8 @@ cru: clock-controller@20200000 { compatible = "rockchip,rv1108-cru"; reg = <0x20200000 0x1000>; + clocks = <&xin24m>; + clock-names = "xin24m"; rockchip,grf = <&grf>; #clock-cells = <1>; #reset-cells = <1>;
Signature · 1 line
2.20.1
PATCH v4 11/16 arm64: dts: rockchip: add clocks property to Rockchip cru nodes
In reply to Johan JonkerAdd clocks and clock-names to the Rockchip cru node, because the device has to have at least one input clock.
With the addition of new properties also sort the node properties a little bit where needed.
---
Changed V4:
combine patches
--- arch/arm64/boot/dts/rockchip/rk3308.dtsi | 5 +++-- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 ++ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 ++ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 ++++ 4 files changed, 11 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3308.dtsi +3 -2
@@ -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>; };
arch/arm64/boot/dts/rockchip/rk3328.dtsi +2 -0
@@ -758,6 +758,8 @@ cru: clock-controller@ff440000 { compatible = "rockchip,rk3328-cru", "rockchip,cru", "syscon"; reg = <0x0 0xff440000 0x0 0x1000>; + clocks = <&xin24m>; + clock-names = "xin24m"; rockchip,grf = <&grf>; #clock-cells = <1>; #reset-cells = <1>;
arch/arm64/boot/dts/rockchip/rk3368.dtsi +2 -0
@@ -747,6 +747,8 @@ cru: clock-controller@ff760000 { compatible = "rockchip,rk3368-cru"; reg = <0x0 0xff760000 0x0 0x1000>; + clocks = <&xin24m>; + clock-names = "xin24m"; rockchip,grf = <&grf>; #clock-cells = <1>; #reset-cells = <1>;
arch/arm64/boot/dts/rockchip/rk3399.dtsi +4 -0
@@ -1416,6 +1416,8 @@ pmucru: pmu-clock-controller@ff750000 { compatible = "rockchip,rk3399-pmucru"; reg = <0x0 0xff750000 0x0 0x1000>; + clocks = <&xin24m>; + clock-names = "xin24m"; rockchip,grf = <&pmugrf>; #clock-cells = <1>; #reset-cells = <1>;
@@ -1426,6 +1428,8 @@ cru: clock-controller@ff760000 { compatible = "rockchip,rk3399-cru"; reg = <0x0 0xff760000 0x0 0x1000>; + clocks = <&xin24m>; + clock-names = "xin24m"; rockchip,grf = <&grf>; #clock-cells = <1>; #reset-cells = <1>;
Signature · 1 line
2.20.1
PATCH v4 12/16 arm64: dts: rockchip: rk3399: use generic node name for pmucru
In reply to Johan JonkerThe node names should be generic, so fix this for the rk3399 pmucru node and rename it to "clock-controller".
--- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3399.dtsi +1 -1
@@ -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>; clocks = <&xin24m>;
Signature · 1 line
2.20.1
PATCH v4 13/16 arm64: dts: rockchip: fix compatible string rk3328 cru node
In reply to Johan JonkerThe rockchip,rk3328-cru.txt file was converted to YAML. A DT test of the rk3328 cru node gives notifications regarding the compatible string. Bring it in line with the binding by removing some unused fall back strings.
--- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3328.dtsi +1 -1
@@ -756,7 +756,7 @@ }; cru: clock-controller@ff440000 { - compatible = "rockchip,rk3328-cru", "rockchip,cru", "syscon"; + compatible = "rockchip,rk3328-cru"; reg = <0x0 0xff440000 0x0 0x1000>; clocks = <&xin24m>; clock-names = "xin24m";
Signature · 1 line
2.20.1
Re: [PATCH v4 13/16] arm64: dts: rockchip: fix compatible string rk3328 cru node
Quoted 4 lines · Johan Jonker
The rockchip,rk3328-cru.txt file was converted to YAML. A DT test of the rk3328 cru node gives notifications regarding the compatible string. Bring it in line with the binding by removing some unused fall back strings.
I explained to you on your v1, syscon is not a fallback compatible.
Quoted 11 lines
Signed-off-by Johan Jonker <[email protected]>--- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm64/boot/dts/rockchip/rk3328.dtsi +0
-0
arch/arm64/boot/dts/rockchip/rk3328.dtsi line 759
Quoted 4 lines
arch/arm64/boot/dts/rockchip/rk3328.dtsi +0
-1@@ -756,7 +756,7 @@ }; cru: clock-controller@ff440000 { - compatible = "rockchip,rk3328-cru", "rockchip,cru", "syscon";
Please do not resend the same patch without changes and without finishing the discussion. This looks wrong (and external references you gave support this). What does this resend means? Discussion is over?
Best regards,
Krzysztof
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v4 14/16 dt-bindings: clock: replace a maintainer for rockchip,rk3399-cru.yaml
In reply to Johan JonkerWith the rk3399 cru YAML conversion the original text author was somehow added as a maintainer, but who's currently no longer involved on the subject. Replace this position with the Rockchip clock maintainer on her request.
--- .../devicetree/bindings/clock/rockchip,rk3399-cru.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.yaml +1 -1
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Rockchip RK3399 Clock and Reset Unit maintainers: - - Xing Zheng <[email protected]> + - Elaine Zhang <[email protected]> - Heiko Stuebner <[email protected]> description: |
Signature · 1 line
2.20.1
PATCH v4 15/16 dt-bindings: clock: use generic node name for pmucru example in rockchip,rk3399-cru.yaml
In reply to Johan JonkerThe node names should be generic, so fix this for the pmucru node example in the rockchip,rk3399-cru.yaml file and rename it to "clock-controller".
--- .../devicetree/bindings/clock/rockchip,rk3399-cru.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.yaml +1 -1
@@ -77,7 +77,7 @@ additionalProperties: false examples: - | - pmucru: pmu-clock-controller@ff750000 { + pmucru: clock-controller@ff750000 { compatible = "rockchip,rk3399-pmucru"; reg = <0xff750000 0x1000>; #clock-cells = <1>;
Signature · 1 line
2.20.1
Re: [PATCH v4 15/16] dt-bindings: clock: use generic node name for pmucru example in rockchip,rk3399-cru.yaml
Quoted 8 lines · Johan Jonker
The node names should be generic, so fix this for the pmucru node example in the rockchip,rk3399-cru.yaml file and rename it to "clock-controller".
Signed-off-by Johan Jonker <[email protected]>--- .../devicetree/bindings/clock/rockchip,rk3399-cru.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
You received here the tag, there were no changes in the patch, yet you ignored it.
This raises my concern that for all other patches you also ignored my tags.
Please resend with collecting appropriate tags from all reviewers. For places you discard the tag, please mention it in each patch changelog (under ---).
Best regards,
Krzysztof
PATCH v4 16/16 dt-bindings: clock: fix some conversion clock issues for rockchip,rk3399-cru.yaml
In reply to Johan JonkerWith the YAML conversion somehow "assigned-xxx" properties where added. If a proper clock is added to the cru node these properties are no longer needed, so removed them.
With the conversion of rockchip,rk3399-cru.txt a table with external clocks was copied. Include these clocks into the schema.
Add clocks and clocks-names to example and make them a requirement. Reorder/restyle so that this file is line with the other Rockchip CRU bindings.
--- .../bindings/clock/rockchip,rk3399-cru.yaml | 55 ++++++++++--------- 1 file changed, 28 insertions(+), 27 deletions(-)
Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.yaml +28 -27
@@ -20,15 +20,8 @@ description: | 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, - - "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 + that they are defined using standard clock bindings with the + clock-output-names defined in this schema. properties: compatible:
@@ -39,37 +32,41 @@ properties: reg: maxItems: 1 - "#clock-cells": - const: 1 - - "#reset-cells": - const: 1 - clocks: minItems: 1 + maxItems: 7 - assigned-clocks: - minItems: 1 - maxItems: 64 - - assigned-clock-parents: + clock-names: minItems: 1 - maxItems: 64 - - assigned-clock-rates: - minItems: 1 - maxItems: 64 + maxItems: 7 + items: + enum: + - xin24m + - xin32k + - clkin_gmac + - clkin_i2s + - clk_usbphy0_480m + - clk_usbphy1_480m + - pclkin_cif 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. + "#clock-cells": + const: 1 + + "#reset-cells": + const: 1 + required: - compatible - reg + - clocks + - clock-names - "#clock-cells" - "#reset-cells"
@@ -80,6 +77,8 @@ examples: pmucru: clock-controller@ff750000 { compatible = "rockchip,rk3399-pmucru"; reg = <0xff750000 0x1000>; + clocks = <&xin24m>; + clock-names = "xin24m"; #clock-cells = <1>; #reset-cells = <1>; };
@@ -87,6 +86,8 @@ examples: cru: clock-controller@ff760000 { compatible = "rockchip,rk3399-cru"; reg = <0xff760000 0x1000>; + clocks = <&xin24m>; + clock-names = "xin24m"; #clock-cells = <1>; #reset-cells = <1>; };
Signature · 1 line
2.20.1
Quoted 8 lines · Johan Jonker
Combined serie of previously converted Rockchip clk bindings.
Changed V4:
combine dts patches
add more clocks
add clocks to example
add clocks requirement
I think I reviewed most of them and gave you tags, but I do not see any tags. Did you remove them because of some change?
See also:
https://elixir.bootlin.com/linux/v5.13/source/Documentation/process/submitting-patches.rst#L543
Best regards,
Krzysztof
Quoted 5 lines · Johan Jonker
Combined serie of previously converted Rockchip clk bindings.
Changed V4:
combine dts patches
add more clocks
Why adding more clocks? The discussion whether to do it did not finish.
You merged all your patches into one series, but this makes impossible to compare them with your previous submission:
b4 diff ...
Analyzing 20 messages in the thread
ERROR: Could not auto-find previous revision
Run "b4 am -T" manually, then "b4 diff -m mbx1 mbx2"
Please provide links to previous versions on lore, so we can check what changed.
Best regards,
Krzysztof