@@ -613,7 +613,8 @@ static const struct samsung_mux_clock exynos5x_mux_clks[] __initconst = {
613
613
MUX (0 , "mout_aclk66" , mout_group1_p , SRC_TOP1 , 8 , 2 ),
614
614
MUX (0 , "mout_aclk166" , mout_group1_p , SRC_TOP1 , 24 , 2 ),
615
615
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 ),
617
618
618
619
MUX (0 , "mout_user_aclk400_isp" , mout_user_aclk400_isp_p ,
619
620
SRC_TOP3 , 0 , 1 ),
@@ -655,8 +656,8 @@ static const struct samsung_mux_clock exynos5x_mux_clks[] __initconst = {
655
656
SRC_TOP5 , 8 , 1 ),
656
657
MUX (0 , "mout_user_aclk266_g2d" , mout_user_aclk266_g2d_p ,
657
658
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 ),
660
661
MUX (0 , "mout_user_aclk300_jpeg" , mout_user_aclk300_jpeg_p ,
661
662
SRC_TOP5 , 20 , 1 ),
662
663
MUX (CLK_MOUT_USER_ACLK300_DISP1 , "mout_user_aclk300_disp1" ,
@@ -665,7 +666,8 @@ static const struct samsung_mux_clock exynos5x_mux_clks[] __initconst = {
665
666
mout_user_aclk300_gscl_p , SRC_TOP5 , 28 , 1 ),
666
667
667
668
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 ),
669
671
MUX (CLK_MOUT_SCLK_SPLL , "mout_sclk_spll" , mout_spll_p , SRC_TOP6 , 8 , 1 ),
670
672
MUX (0 , "mout_sclk_ipll" , mout_ipll_p , SRC_TOP6 , 12 , 1 ),
671
673
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 = {
709
711
SRC_TOP12 , 8 , 1 ),
710
712
MUX (0 , "mout_sw_aclk266_g2d" , mout_sw_aclk266_g2d_p ,
711
713
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 ),
713
716
MUX (0 , "mout_sw_aclk300_jpeg" , mout_sw_aclk300_jpeg_p ,
714
717
SRC_TOP12 , 20 , 1 ),
715
718
MUX (CLK_MOUT_SW_ACLK300 , "mout_sw_aclk300_disp1" ,
@@ -806,8 +809,8 @@ static const struct samsung_div_clock exynos5x_div_clks[] __initconst = {
806
809
DIV_TOP2 , 8 , 3 ),
807
810
DIV (CLK_DOUT_ACLK266_G2D , "dout_aclk266_g2d" , "mout_aclk266_g2d" ,
808
811
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 ),
811
814
DIV (CLK_DOUT_ACLK300_JPEG , "dout_aclk300_jpeg" , "mout_aclk300_jpeg" ,
812
815
DIV_TOP2 , 20 , 3 ),
813
816
DIV (CLK_DOUT_ACLK300_DISP1 , "dout_aclk300_disp1" ,
@@ -1255,7 +1258,8 @@ static struct exynos5_subcmu_reg_dump exynos5x_gsc_suspend_regs[] = {
1255
1258
};
1256
1259
1257
1260
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 ),
1259
1263
};
1260
1264
1261
1265
static struct exynos5_subcmu_reg_dump exynos5x_g3d_suspend_regs [] = {
0 commit comments