Skip to content

Commit 6fffe52

Browse files
pgwipeoutmmind
authored andcommitted
clk: rockchip: drop GRF dependency for rk3328/rk3036 pll types
The rk3036/rk3328 pll types were converted to checking the lock status via the internal register in january 2020, so don't need the grf reference since then. But it was forgotten to remove grf check when deciding between the pll rate ops (read-only vs. read-write), so a clock driver without the needed grf reference might've been put into the read-only mode just because the grf reference was missing. This affected the rk356x that needs to reclock certain plls at boot. Fix this by removing the check for the grf for selecting the utilized operations. Suggested-by: Heiko Stuebner <[email protected]> Fixes: 7f6ffbb ("clk: rockchip: convert rk3036 pll type to use internal lock status") Signed-off-by: Peter Geis <[email protected]> [adjusted the commit message, adjusted the fixes tag] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Heiko Stuebner <[email protected]>
1 parent d475653 commit 6fffe52

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/clk/rockchip/clk-pll.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx,
940940
switch (pll_type) {
941941
case pll_rk3036:
942942
case pll_rk3328:
943-
if (!pll->rate_table || IS_ERR(ctx->grf))
943+
if (!pll->rate_table)
944944
init.ops = &rockchip_rk3036_pll_clk_norate_ops;
945945
else
946946
init.ops = &rockchip_rk3036_pll_clk_ops;

0 commit comments

Comments
 (0)