Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: rockchip: rk3128: Fix aclk_peri_src's parent

According to the TRM there are no specific gpll_peri, cpll_peri,
gpll_div2_peri or gpll_div3_peri gates, but a single clk_peri_src gate.
Instead mux_clk_peri_src directly connects to the plls respectively the pll
divider clocks.
Fix this by creating a single gated composite.

Also rename all occurrences of aclk_peri_src to clk_peri_src, since it
is the parent for peri aclks, pclks and hclks. That name also matches
the one used in the TRM.

Fixes: f6022e88faca ("clk: rockchip: add clock controller for rk3128")
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
[renamed aclk_peri_src -> clk_peri_src and added commit message]
Signed-off-by: Alex Bee <knaerzche@gmail.com>
Link: https://lore.kernel.org/r/20231127181415.11735-4-knaerzche@gmail.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

authored by

Finley Xiao and committed by
Heiko Stuebner
98dcc6be c6c5a558

+7 -13
+7 -13
drivers/clk/rockchip/clk-rk3128.c
··· 138 138 PNAME(mux_pll_src_4plls_p) = { "cpll", "gpll", "gpll_div2", "usb480m" }; 139 139 PNAME(mux_pll_src_3plls_p) = { "cpll", "gpll", "gpll_div2" }; 140 140 141 - PNAME(mux_aclk_peri_src_p) = { "gpll_peri", "cpll_peri", "gpll_div2_peri", "gpll_div3_peri" }; 141 + PNAME(mux_clk_peri_src_p) = { "gpll", "cpll", "gpll_div2", "gpll_div3" }; 142 142 PNAME(mux_mmc_src_p) = { "cpll", "gpll", "gpll_div2", "xin24m" }; 143 143 PNAME(mux_clk_cif_out_src_p) = { "clk_cif_src", "xin24m" }; 144 144 PNAME(mux_sclk_vop_src_p) = { "cpll", "gpll", "gpll_div2", "gpll_div3" }; ··· 275 275 RK2928_CLKGATE_CON(0), 11, GFLAGS), 276 276 277 277 /* PD_PERI */ 278 - GATE(0, "gpll_peri", "gpll", CLK_IGNORE_UNUSED, 278 + COMPOSITE(0, "clk_peri_src", mux_clk_peri_src_p, 0, 279 + RK2928_CLKSEL_CON(10), 14, 2, MFLAGS, 0, 5, DFLAGS, 279 280 RK2928_CLKGATE_CON(2), 0, GFLAGS), 280 - GATE(0, "cpll_peri", "cpll", CLK_IGNORE_UNUSED, 281 - RK2928_CLKGATE_CON(2), 0, GFLAGS), 282 - GATE(0, "gpll_div2_peri", "gpll_div2", CLK_IGNORE_UNUSED, 283 - RK2928_CLKGATE_CON(2), 0, GFLAGS), 284 - GATE(0, "gpll_div3_peri", "gpll_div3", CLK_IGNORE_UNUSED, 285 - RK2928_CLKGATE_CON(2), 0, GFLAGS), 286 - COMPOSITE_NOGATE(0, "aclk_peri_src", mux_aclk_peri_src_p, 0, 287 - RK2928_CLKSEL_CON(10), 14, 2, MFLAGS, 0, 5, DFLAGS), 288 - COMPOSITE_NOMUX(PCLK_PERI, "pclk_peri", "aclk_peri_src", 0, 281 + 282 + COMPOSITE_NOMUX(PCLK_PERI, "pclk_peri", "clk_peri_src", 0, 289 283 RK2928_CLKSEL_CON(10), 12, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO, 290 284 RK2928_CLKGATE_CON(2), 3, GFLAGS), 291 - COMPOSITE_NOMUX(HCLK_PERI, "hclk_peri", "aclk_peri_src", 0, 285 + COMPOSITE_NOMUX(HCLK_PERI, "hclk_peri", "clk_peri_src", 0, 292 286 RK2928_CLKSEL_CON(10), 8, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO, 293 287 RK2928_CLKGATE_CON(2), 2, GFLAGS), 294 - GATE(ACLK_PERI, "aclk_peri", "aclk_peri_src", 0, 288 + GATE(ACLK_PERI, "aclk_peri", "clk_peri_src", 0, 295 289 RK2928_CLKGATE_CON(2), 1, GFLAGS), 296 290 297 291 GATE(SCLK_TIMER0, "sclk_timer0", "xin24m", 0,