Skip to contentSkip to conversation

arm64: dts: rockchip: add missing rockchip,grf property to rk356x

PATCH Applied Michael Riesch 3 participants 7 messages Aug 23, 2021 – Aug 25, 2021

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

cover arm64: dts: rockchip: add missing rockchip,grf property to rk356x

Hi all,

The following error messages appear on my RK3568 EVB1 board during boot:

rockchip_clk_register_muxgrf: regmap not available rockchip_clk_register_branches: failed to register clock clk_ddr1x: -524

These can be fixed by providing the missing rockchip,grf property to the device tree (similar to other Rockchip SoCs, such as the RK3399).

However, the rockchip,rk3568-cru bindings do not specify a property of that name. Am I missing something or should this property be added to the bindings?

Best regards,
Michael

Michael Riesch (1):
arm64: dts: rockchip: add missing rockchip,grf property to rk356x

 arch/arm64/boot/dts/rockchip/rk356x.dtsi | 1 +
 1 file changed, 1 insertion(+)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 arm64: dts: rockchip: add missing rockchip,grf property to rk356x

This commit fixes the error messages

rockchip_clk_register_muxgrf: regmap not available rockchip_clk_register_branches: failed to register clock clk_ddr1x: -524

during boot by providing the missing rockchip,grf property.

---
 arch/arm64/boot/dts/rockchip/rk356x.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/rockchip/rk356x.dtsi +1 -0
index 23949e79d8ce..0a1d07c96b2e 100644
@@ -233,6 +233,7 @@
 		#reset-cells = <1>;
 		assigned-clocks = <&cru PLL_GPLL>, <&pmucru PLL_PPLL>;
 		assigned-clock-rates = <1200000000>, <200000000>;
+		rockchip,grf = <&grf>;
 	};
 
 	i2c0: i2c@fdd40000 {
Signature · 1 line
2.17.1
#2 lore raw
Quoted 7 lines · Michael Riesch

This commit fixes the error messages

rockchip_clk_register_muxgrf: regmap not available rockchip_clk_register_branches: failed to register clock clk_ddr1x: -524

during boot by providing the missing rockchip,grf property.

Good Morning,

This was fixed by commit: 6fffe52fb336 clk: rockchip: drop GRF dependency for rk3328/rk3036 pll types
which was merged in -next. I don't believe it's going to be backported to 5.14 due to 5.14 not being able to fully boot.

Very Respectfully,
Peter Geis

Quoted 21 lines
---
 arch/arm64/boot/dts/rockchip/rk356x.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/rockchip/rk356x.dtsi +1 -1
index 23949e79d8ce..0a1d07c96b2e 100644
@@ -233,6 +233,7 @@
                #reset-cells = <1>;
                assigned-clocks = <&cru PLL_GPLL>, <&pmucru PLL_PPLL>;
                assigned-clock-rates = <1200000000>, <200000000>;
+               rockchip,grf = <&grf>;
        };
 
        i2c0: i2c@fdd40000 {
--

2.17.1

#3 lore raw

Hi Peter,

Quoted 8 lines · Peter Geis
Quoted 6 lines · Michael Riesch

This commit fixes the error messages

rockchip_clk_register_muxgrf: regmap not available rockchip_clk_register_branches: failed to register clock clk_ddr1x: -524

Quoted 8 lines
Quoted 1 line

during boot by providing the missing rockchip,grf property.

Good Morning,

This was fixed by commit: 6fffe52fb336 clk: rockchip: drop GRF dependency for rk3328/rk3036 pll types
which was merged in -next. I don't believe it's going to be backported to 5.14 due to 5.14 not being able to fully boot.

Unfortunately not, I am afraid. I am working on Heiko's current -next and the commit you mentioned is present. Nevertheless I got these error messages.

They can be traced down to "rockchip_clk_register_muxgrf", which fails as the passed argument regmap is invalid due to the missing device tree property. The clock "clk_ddr1x" is added in clk-rk3568.c as "MUXGRF", which leads me to believe that the grf property is actually required.

Best regards,
Michael

Quoted 25 lines

Very Respectfully,
Peter Geis

Quoted 21 lines
---
 arch/arm64/boot/dts/rockchip/rk356x.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/rockchip/rk356x.dtsi +1 -1
index 23949e79d8ce..0a1d07c96b2e 100644
@@ -233,6 +233,7 @@
                #reset-cells = <1>;
                assigned-clocks = <&cru PLL_GPLL>, <&pmucru PLL_PPLL>;
                assigned-clock-rates = <1200000000>, <200000000>;
+               rockchip,grf = <&grf>;
        };
 
        i2c0: i2c@fdd40000 {
--

2.17.1

Tested-by
#4 lore raw
Quoted 21 lines · Michael Riesch

Hi Peter,

Quoted 8 lines · Peter Geis
Quoted 6 lines · Michael Riesch

This commit fixes the error messages

rockchip_clk_register_muxgrf: regmap not available rockchip_clk_register_branches: failed to register clock clk_ddr1x: -524

Quoted 8 lines
Quoted 1 line

during boot by providing the missing rockchip,grf property.

Good Morning,

This was fixed by commit: 6fffe52fb336 clk: rockchip: drop GRF dependency for rk3328/rk3036 pll types
which was merged in -next. I don't believe it's going to be backported to 5.14 due to 5.14 not being able to fully boot.

Quoted 8 lines

Unfortunately not, I am afraid. I am working on Heiko's current -next and the commit you mentioned is present. Nevertheless I got these error messages.

They can be traced down to "rockchip_clk_register_muxgrf", which fails as the passed argument regmap is invalid due to the missing device tree property. The clock "clk_ddr1x" is added in clk-rk3568.c as "MUXGRF", which leads me to believe that the grf property is actually required.

Ah, yes it seems you are correct.
I had inadvertently fixed this a while ago in my own tree. Confirmed without the GRF ddr1x clk doesn't register.

On a related note, are you planning on working on the DVFS driver, since it will be the only consumer of this clock?

Quoted 29 lines

Best regards,
Michael

Quoted 25 lines

Very Respectfully,
Peter Geis

Quoted 21 lines
---
 arch/arm64/boot/dts/rockchip/rk356x.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/rockchip/rk356x.dtsi +1 -1
index 23949e79d8ce..0a1d07c96b2e 100644
@@ -233,6 +233,7 @@
                #reset-cells = <1>;
                assigned-clocks = <&cru PLL_GPLL>, <&pmucru PLL_PPLL>;
                assigned-clock-rates = <1200000000>, <200000000>;
+               rockchip,grf = <&grf>;
        };
 
        i2c0: i2c@fdd40000 {
--

2.17.1

#5 lore raw

Hi Peter,

Quoted 32 lines · Peter Geis
Quoted 21 lines · Michael Riesch

Hi Peter,

Quoted 8 lines · Peter Geis
Quoted 6 lines · Michael Riesch

This commit fixes the error messages

rockchip_clk_register_muxgrf: regmap not available rockchip_clk_register_branches: failed to register clock clk_ddr1x: -524

Quoted 8 lines
Quoted 1 line

during boot by providing the missing rockchip,grf property.

Good Morning,

This was fixed by commit: 6fffe52fb336 clk: rockchip: drop GRF dependency for rk3328/rk3036 pll types
which was merged in -next. I don't believe it's going to be backported to 5.14 due to 5.14 not being able to fully boot.

Quoted 8 lines

Unfortunately not, I am afraid. I am working on Heiko's current -next and the commit you mentioned is present. Nevertheless I got these error messages.

They can be traced down to "rockchip_clk_register_muxgrf", which fails as the passed argument regmap is invalid due to the missing device tree property. The clock "clk_ddr1x" is added in clk-rk3568.c as "MUXGRF", which leads me to believe that the grf property is actually required.

Quoted 5 lines

Ah, yes it seems you are correct.
I had inadvertently fixed this a while ago in my own tree. Confirmed without the GRF ddr1x clk doesn't register.

Thanks for testing/your T-B!

Quoted 2 lines

On a related note, are you planning on working on the DVFS driver, since it will be the only consumer of this clock?

Until now I was not aware of this, so it is not on my plan. But thanks for pointing it out, it is definitely something we would like to see (and maybe could help to implement).

Best regards,
Michael

Quoted 30 lines
Quoted 30 lines

Best regards,
Michael

Quoted 25 lines

Very Respectfully,
Peter Geis

Quoted 21 lines
---
 arch/arm64/boot/dts/rockchip/rk356x.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/rockchip/rk356x.dtsi +1 -1
index 23949e79d8ce..0a1d07c96b2e 100644
@@ -233,6 +233,7 @@
                #reset-cells = <1>;
                assigned-clocks = <&cru PLL_GPLL>, <&pmucru PLL_PPLL>;
                assigned-clock-rates = <1200000000>, <200000000>;
+               rockchip,grf = <&grf>;
        };
 
        i2c0: i2c@fdd40000 {
--

2.17.1

maintainer Applied
#6 lore raw
In reply to Michael Riesch
Quoted 9 lines · Michael Riesch

The following error messages appear on my RK3568 EVB1 board during boot:

rockchip_clk_register_muxgrf: regmap not available rockchip_clk_register_branches: failed to register clock clk_ddr1x: -524

These can be fixed by providing the missing rockchip,grf property to the device tree (similar to other Rockchip SoCs, such as the RK3399).

[...]

Applied, thanks!

[1/1] arm64: dts: rockchip: add missing rockchip,grf property to rk356x

      commit: 7e0a31c49b5a1dc16540581d2a9cbe35da97c06c

Best regards,

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