Skip to content

Commit 45f10da

Browse files
mszyprowSylwester Nawrocki
authored and
Sylwester Nawrocki
committed
clk: samsung: exynos5420: Add SET_RATE_PARENT flag to clocks on G3D path
Add CLK_SET_RATE_PARENT flag to all clocks on the path from VPLL to G3D, so the G3D MALI driver can simply adjust the rate of its clock by doing a single clk_set_rate() call, without the need to know the whole clock topology in Exynos542x SoCs. Suggested-by: Marian Mihailescu <[email protected]> Signed-off-by: Marek Szyprowski <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]>
1 parent e21be0d commit 45f10da

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

drivers/clk/samsung/clk-exynos5420.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,8 @@ static const struct samsung_mux_clock exynos5x_mux_clks[] __initconst = {
613613
MUX(0, "mout_aclk66", mout_group1_p, SRC_TOP1, 8, 2),
614614
MUX(0, "mout_aclk166", mout_group1_p, SRC_TOP1, 24, 2),
615615

616-
MUX(0, "mout_aclk_g3d", mout_group5_p, SRC_TOP2, 16, 1),
616+
MUX_F(0, "mout_aclk_g3d", mout_group5_p, SRC_TOP2, 16, 1,
617+
CLK_SET_RATE_PARENT, 0),
617618

618619
MUX(0, "mout_user_aclk400_isp", mout_user_aclk400_isp_p,
619620
SRC_TOP3, 0, 1),
@@ -655,8 +656,8 @@ static const struct samsung_mux_clock exynos5x_mux_clks[] __initconst = {
655656
SRC_TOP5, 8, 1),
656657
MUX(0, "mout_user_aclk266_g2d", mout_user_aclk266_g2d_p,
657658
SRC_TOP5, 12, 1),
658-
MUX(CLK_MOUT_G3D, "mout_user_aclk_g3d", mout_user_aclk_g3d_p,
659-
SRC_TOP5, 16, 1),
659+
MUX_F(CLK_MOUT_G3D, "mout_user_aclk_g3d", mout_user_aclk_g3d_p,
660+
SRC_TOP5, 16, 1, CLK_SET_RATE_PARENT, 0),
660661
MUX(0, "mout_user_aclk300_jpeg", mout_user_aclk300_jpeg_p,
661662
SRC_TOP5, 20, 1),
662663
MUX(CLK_MOUT_USER_ACLK300_DISP1, "mout_user_aclk300_disp1",
@@ -665,7 +666,8 @@ static const struct samsung_mux_clock exynos5x_mux_clks[] __initconst = {
665666
mout_user_aclk300_gscl_p, SRC_TOP5, 28, 1),
666667

667668
MUX(0, "mout_sclk_mpll", mout_mpll_p, SRC_TOP6, 0, 1),
668-
MUX(CLK_MOUT_VPLL, "mout_sclk_vpll", mout_vpll_p, SRC_TOP6, 4, 1),
669+
MUX_F(CLK_MOUT_VPLL, "mout_sclk_vpll", mout_vpll_p, SRC_TOP6, 4, 1,
670+
CLK_SET_RATE_PARENT, 0),
669671
MUX(CLK_MOUT_SCLK_SPLL, "mout_sclk_spll", mout_spll_p, SRC_TOP6, 8, 1),
670672
MUX(0, "mout_sclk_ipll", mout_ipll_p, SRC_TOP6, 12, 1),
671673
MUX(0, "mout_sclk_rpll", mout_rpll_p, SRC_TOP6, 16, 1),
@@ -709,7 +711,8 @@ static const struct samsung_mux_clock exynos5x_mux_clks[] __initconst = {
709711
SRC_TOP12, 8, 1),
710712
MUX(0, "mout_sw_aclk266_g2d", mout_sw_aclk266_g2d_p,
711713
SRC_TOP12, 12, 1),
712-
MUX(0, "mout_sw_aclk_g3d", mout_sw_aclk_g3d_p, SRC_TOP12, 16, 1),
714+
MUX_F(0, "mout_sw_aclk_g3d", mout_sw_aclk_g3d_p, SRC_TOP12, 16, 1,
715+
CLK_SET_RATE_PARENT, 0),
713716
MUX(0, "mout_sw_aclk300_jpeg", mout_sw_aclk300_jpeg_p,
714717
SRC_TOP12, 20, 1),
715718
MUX(CLK_MOUT_SW_ACLK300, "mout_sw_aclk300_disp1",
@@ -806,8 +809,8 @@ static const struct samsung_div_clock exynos5x_div_clks[] __initconst = {
806809
DIV_TOP2, 8, 3),
807810
DIV(CLK_DOUT_ACLK266_G2D, "dout_aclk266_g2d", "mout_aclk266_g2d",
808811
DIV_TOP2, 12, 3),
809-
DIV(CLK_DOUT_ACLK_G3D, "dout_aclk_g3d", "mout_aclk_g3d", DIV_TOP2,
810-
16, 3),
812+
DIV_F(CLK_DOUT_ACLK_G3D, "dout_aclk_g3d", "mout_aclk_g3d", DIV_TOP2,
813+
16, 3, CLK_SET_RATE_PARENT, 0),
811814
DIV(CLK_DOUT_ACLK300_JPEG, "dout_aclk300_jpeg", "mout_aclk300_jpeg",
812815
DIV_TOP2, 20, 3),
813816
DIV(CLK_DOUT_ACLK300_DISP1, "dout_aclk300_disp1",
@@ -1255,7 +1258,8 @@ static struct exynos5_subcmu_reg_dump exynos5x_gsc_suspend_regs[] = {
12551258
};
12561259

12571260
static const struct samsung_gate_clock exynos5x_g3d_gate_clks[] __initconst = {
1258-
GATE(CLK_G3D, "g3d", "mout_user_aclk_g3d", GATE_IP_G3D, 9, 0, 0),
1261+
GATE(CLK_G3D, "g3d", "mout_user_aclk_g3d", GATE_IP_G3D, 9,
1262+
CLK_SET_RATE_PARENT, 0),
12591263
};
12601264

12611265
static struct exynos5_subcmu_reg_dump exynos5x_g3d_suspend_regs[] = {

0 commit comments

Comments
 (0)