clk: rockchip: fix rk3568 cpll clk gate bits
Subsystems (2)
PATCH 1/1 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.
--- drivers/clk/rockchip/clk-rk3568.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/clk/rockchip/clk-rk3568.c +5 -5
@@ -454,17 +454,17 @@ static struct rockchip_clk_branch rk3568_clk_branches[] __initdata = {COMPOSITE_NOMUX (CPLL_125M ,"cpll_125m" ,"cpll" ,CLK_IGNORE_UNUSED ,RK3568_CLKSEL_CON (80 ),0 ,5 ,DFLAGS ,RK3568_CLKGATE_CON (35 ),10 ,GFLAGS ), +COMPOSITE_NOMUX (CPLL_100M ,"cpll_100m" ,"cpll" ,CLK_IGNORE_UNUSED , +RK3568_CLKSEL_CON (82 ),0 ,5 ,DFLAGS , +RK3568_CLKGATE_CON (35 ),11 ,GFLAGS ),COMPOSITE_NOMUX (CPLL_62P5M ,"cpll_62p5" ,"cpll" ,CLK_IGNORE_UNUSED ,RK3568_CLKSEL_CON (80 ),8 ,5 ,DFLAGS , -RK3568_CLKGATE_CON (35 ),11 ,GFLAGS ), +RK3568_CLKGATE_CON (35 ),12 ,GFLAGS ),COMPOSITE_NOMUX (CPLL_50M ,"cpll_50m" ,"cpll" ,CLK_IGNORE_UNUSED ,RK3568_CLKSEL_CON (81 ),0 ,5 ,DFLAGS , -RK3568_CLKGATE_CON (35 ),12 ,GFLAGS ), +RK3568_CLKGATE_CON (35 ),13 ,GFLAGS ),COMPOSITE_NOMUX (CPLL_25M ,"cpll_25m" ,"cpll" ,CLK_IGNORE_UNUSED ,RK3568_CLKSEL_CON (81 ),8 ,6 ,DFLAGS , -RK3568_CLKGATE_CON (35 ),13 ,GFLAGS ), -COMPOSITE_NOMUX (CPLL_100M ,"cpll_100m" ,"cpll" ,CLK_IGNORE_UNUSED , -RK3568_CLKSEL_CON (82 ),0 ,5 ,DFLAGS ,RK3568_CLKGATE_CON (35 ),14 ,GFLAGS ), COMPOSITE_NOMUX(0, "clk_osc0_div_750k", "xin24m", CLK_IGNORE_UNUSED, RK3568_CLKSEL_CON(82), 8, 6, DFLAGS,
Signature · 1 line
2.25.1
Hi: Michael:
Thanks for your patch.
Quoted 31 lines · Peter Geis
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 thecpll_100mwas shut off instead of thecpll_62p5.cpll_62p5,cpll_50m,cpll_25mwere all off by one withcpll_100mmisplaced.Fixes cf911d89c4c5 ("clk: rockchip: add clock controller for rk3568")Signed-off-by Peter Geis <[email protected]>--- drivers/clk/rockchip/clk-rk3568.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/clk/rockchip/clk-rk3568.c +4
-1@@ -454,17 +454,17 @@ static struct rockchip_clk_branch rk3568_clk_branches[] __initdata = {COMPOSITE_NOMUX (CPLL_125M ,"cpll_125m" ,"cpll" ,CLK_IGNORE_UNUSED ,RK3568_CLKSEL_CON (80 ),0 ,5 ,DFLAGS ,RK3568_CLKGATE_CON (35 ),10 ,GFLAGS ), +COMPOSITE_NOMUX (CPLL_100M ,"cpll_100m" ,"cpll" ,CLK_IGNORE_UNUSED , +RK3568_CLKSEL_CON (82 ),0 ,5 ,DFLAGS , +RK3568_CLKGATE_CON (35 ),11 ,GFLAGS ),COMPOSITE_NOMUX (CPLL_62P5M ,"cpll_62p5" ,"cpll" ,CLK_IGNORE_UNUSED ,RK3568_CLKSEL_CON (80 ),8 ,5 ,DFLAGS , -RK3568_CLKGATE_CON (35 ),11 ,GFLAGS ), +RK3568_CLKGATE_CON (35 ),12 ,GFLAGS ), COMPOSITE_NOMUX(CPLL_50M, "cpll_50m", "cpll", CLK_IGNORE_UNUSED, RK3568_CLKSEL_CON(81), 0, 5, DFLAGS,
drivers/clk/rockchip/clk-rk3568.c static struct rockchip_clk_branch rk3568_clk_branches[] __initdata = { · line 470
Quoted 10 lines
drivers/clk/rockchip/clk-rk3568.c +1
-4- RK3568_CLKGATE_CON(35), 12, GFLAGS), + RK3568_CLKGATE_CON(35), 13, GFLAGS),COMPOSITE_NOMUX (CPLL_25M ,"cpll_25m" ,"cpll" ,CLK_IGNORE_UNUSED ,RK3568_CLKSEL_CON (81 ),8 ,6 ,DFLAGS , -RK3568_CLKGATE_CON (35 ),13 ,GFLAGS ), -COMPOSITE_NOMUX (CPLL_100M ,"cpll_100m" ,"cpll" ,CLK_IGNORE_UNUSED , -RK3568_CLKSEL_CON (82 ),0 ,5 ,DFLAGS ,RK3568_CLKGATE_CON (35 ),14 ,GFLAGS ), COMPOSITE_NOMUX(0, "clk_osc0_div_750k", "xin24m", CLK_IGNORE_UNUSED, RK3568_CLKSEL_CON(82), 8, 6, DFLAGS,
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Quoted 8 lines · Peter Geis
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 thecpll_100mwas shut off instead of thecpll_62p5.cpll_62p5,cpll_50m,cpll_25mwere all off by one withcpll_100mmisplaced.[...]
Applied, thanks!
[1/1] clk: rockchip: fix rk3568 cpll clk gate bits
commit: 2f3877d609e7951ef96d24979eb9d163f1f004f8
Best regards,
Signature · 1 line
Heiko Stuebner <[email protected]>