Skip to content

Commit 2f3877d

Browse files
pgwipeoutmmind
authored andcommitted
clk: rockchip: fix rk3568 cpll clk gate bits
The cpll clk gate bits had an ordering issue. This led to the loss of the boot sdmmc controller when the gmac was shut down with: `ip link set eth0 down` as the cpll_100m was shut off instead of the cpll_62p5. cpll_62p5, cpll_50m, cpll_25m were all off by one with cpll_100m misplaced. Fixes: cf911d8 ("clk: rockchip: add clock controller for rk3568") Signed-off-by: Peter Geis <[email protected]> Reviewed-by: Elaine Zhang<[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Heiko Stuebner <[email protected]>
1 parent 2302915 commit 2f3877d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/clk/rockchip/clk-rk3568.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -454,17 +454,17 @@ static struct rockchip_clk_branch rk3568_clk_branches[] __initdata = {
454454
COMPOSITE_NOMUX(CPLL_125M, "cpll_125m", "cpll", CLK_IGNORE_UNUSED,
455455
RK3568_CLKSEL_CON(80), 0, 5, DFLAGS,
456456
RK3568_CLKGATE_CON(35), 10, GFLAGS),
457+
COMPOSITE_NOMUX(CPLL_100M, "cpll_100m", "cpll", CLK_IGNORE_UNUSED,
458+
RK3568_CLKSEL_CON(82), 0, 5, DFLAGS,
459+
RK3568_CLKGATE_CON(35), 11, GFLAGS),
457460
COMPOSITE_NOMUX(CPLL_62P5M, "cpll_62p5", "cpll", CLK_IGNORE_UNUSED,
458461
RK3568_CLKSEL_CON(80), 8, 5, DFLAGS,
459-
RK3568_CLKGATE_CON(35), 11, GFLAGS),
462+
RK3568_CLKGATE_CON(35), 12, GFLAGS),
460463
COMPOSITE_NOMUX(CPLL_50M, "cpll_50m", "cpll", CLK_IGNORE_UNUSED,
461464
RK3568_CLKSEL_CON(81), 0, 5, DFLAGS,
462-
RK3568_CLKGATE_CON(35), 12, GFLAGS),
465+
RK3568_CLKGATE_CON(35), 13, GFLAGS),
463466
COMPOSITE_NOMUX(CPLL_25M, "cpll_25m", "cpll", CLK_IGNORE_UNUSED,
464467
RK3568_CLKSEL_CON(81), 8, 6, DFLAGS,
465-
RK3568_CLKGATE_CON(35), 13, GFLAGS),
466-
COMPOSITE_NOMUX(CPLL_100M, "cpll_100m", "cpll", CLK_IGNORE_UNUSED,
467-
RK3568_CLKSEL_CON(82), 0, 5, DFLAGS,
468468
RK3568_CLKGATE_CON(35), 14, GFLAGS),
469469
COMPOSITE_NOMUX(0, "clk_osc0_div_750k", "xin24m", CLK_IGNORE_UNUSED,
470470
RK3568_CLKSEL_CON(82), 8, 6, DFLAGS,

0 commit comments

Comments
 (0)