On 19-10-09 09:58:14, Peng Fan wrote: > From: Peng Fan <[email protected]> > > According Architecture definition guide, SYS_PLL1 is fixed at > 800MHz, SYS_PLL2 is fixed at 1000MHz, so let's use imx_clk_fixed > to register the clocks and drop code that could change the rate. > > Signed-off-by: Peng Fan <[email protected]>
For the entire series: Reviewed-by: Abel Vesa <[email protected]> > --- > drivers/clk/imx/clk-imx8mm.c | 14 ++++---------- > 1 file changed, 4 insertions(+), 10 deletions(-) > > diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c > index 04876ec66127..ae7321ab7837 100644 > --- a/drivers/clk/imx/clk-imx8mm.c > +++ b/drivers/clk/imx/clk-imx8mm.c > @@ -34,8 +34,6 @@ static const char *dram_pll_bypass_sels[] = {"dram_pll", > "dram_pll_ref_sel", }; > static const char *gpu_pll_bypass_sels[] = {"gpu_pll", "gpu_pll_ref_sel", }; > static const char *vpu_pll_bypass_sels[] = {"vpu_pll", "vpu_pll_ref_sel", }; > static const char *arm_pll_bypass_sels[] = {"arm_pll", "arm_pll_ref_sel", }; > -static const char *sys_pll1_bypass_sels[] = {"sys_pll1", "sys_pll1_ref_sel", > }; > -static const char *sys_pll2_bypass_sels[] = {"sys_pll2", "sys_pll2_ref_sel", > }; > static const char *sys_pll3_bypass_sels[] = {"sys_pll3", "sys_pll3_ref_sel", > }; > > /* CCM ROOT */ > @@ -325,8 +323,6 @@ static int imx8mm_clocks_probe(struct platform_device > *pdev) > clks[IMX8MM_GPU_PLL_REF_SEL] = imx_clk_mux("gpu_pll_ref_sel", base + > 0x64, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); > clks[IMX8MM_VPU_PLL_REF_SEL] = imx_clk_mux("vpu_pll_ref_sel", base + > 0x74, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); > clks[IMX8MM_ARM_PLL_REF_SEL] = imx_clk_mux("arm_pll_ref_sel", base + > 0x84, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); > - clks[IMX8MM_SYS_PLL1_REF_SEL] = imx_clk_mux("sys_pll1_ref_sel", base + > 0x94, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); > - clks[IMX8MM_SYS_PLL2_REF_SEL] = imx_clk_mux("sys_pll2_ref_sel", base + > 0x104, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); > clks[IMX8MM_SYS_PLL3_REF_SEL] = imx_clk_mux("sys_pll3_ref_sel", base + > 0x114, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); > > clks[IMX8MM_AUDIO_PLL1] = imx_clk_pll14xx("audio_pll1", > "audio_pll1_ref_sel", base, &imx_1443x_pll); > @@ -336,8 +332,8 @@ static int imx8mm_clocks_probe(struct platform_device > *pdev) > clks[IMX8MM_GPU_PLL] = imx_clk_pll14xx("gpu_pll", "gpu_pll_ref_sel", > base + 0x64, &imx_1416x_pll); > clks[IMX8MM_VPU_PLL] = imx_clk_pll14xx("vpu_pll", "vpu_pll_ref_sel", > base + 0x74, &imx_1416x_pll); > clks[IMX8MM_ARM_PLL] = imx_clk_pll14xx("arm_pll", "arm_pll_ref_sel", > base + 0x84, &imx_1416x_pll); > - clks[IMX8MM_SYS_PLL1] = imx_clk_pll14xx("sys_pll1", "sys_pll1_ref_sel", > base + 0x94, &imx_1416x_pll); > - clks[IMX8MM_SYS_PLL2] = imx_clk_pll14xx("sys_pll2", "sys_pll2_ref_sel", > base + 0x104, &imx_1416x_pll); > + clks[IMX8MM_SYS_PLL1] = imx_clk_fixed("sys_pll1", 800000000); > + clks[IMX8MM_SYS_PLL2] = imx_clk_fixed("sys_pll2", 1000000000); > clks[IMX8MM_SYS_PLL3] = imx_clk_pll14xx("sys_pll3", "sys_pll3_ref_sel", > base + 0x114, &imx_1416x_pll); > > /* PLL bypass out */ > @@ -348,8 +344,6 @@ static int imx8mm_clocks_probe(struct platform_device > *pdev) > clks[IMX8MM_GPU_PLL_BYPASS] = imx_clk_mux_flags("gpu_pll_bypass", base > + 0x64, 28, 1, gpu_pll_bypass_sels, ARRAY_SIZE(gpu_pll_bypass_sels), > CLK_SET_RATE_PARENT); > clks[IMX8MM_VPU_PLL_BYPASS] = imx_clk_mux_flags("vpu_pll_bypass", base > + 0x74, 28, 1, vpu_pll_bypass_sels, ARRAY_SIZE(vpu_pll_bypass_sels), > CLK_SET_RATE_PARENT); > clks[IMX8MM_ARM_PLL_BYPASS] = imx_clk_mux_flags("arm_pll_bypass", base > + 0x84, 28, 1, arm_pll_bypass_sels, ARRAY_SIZE(arm_pll_bypass_sels), > CLK_SET_RATE_PARENT); > - clks[IMX8MM_SYS_PLL1_BYPASS] = imx_clk_mux_flags("sys_pll1_bypass", > base + 0x94, 28, 1, sys_pll1_bypass_sels, ARRAY_SIZE(sys_pll1_bypass_sels), > CLK_SET_RATE_PARENT); > - clks[IMX8MM_SYS_PLL2_BYPASS] = imx_clk_mux_flags("sys_pll2_bypass", > base + 0x104, 28, 1, sys_pll2_bypass_sels, ARRAY_SIZE(sys_pll2_bypass_sels), > CLK_SET_RATE_PARENT); > clks[IMX8MM_SYS_PLL3_BYPASS] = imx_clk_mux_flags("sys_pll3_bypass", > base + 0x114, 28, 1, sys_pll3_bypass_sels, ARRAY_SIZE(sys_pll3_bypass_sels), > CLK_SET_RATE_PARENT); > > /* PLL out gate */ > @@ -360,8 +354,8 @@ static int imx8mm_clocks_probe(struct platform_device > *pdev) > clks[IMX8MM_GPU_PLL_OUT] = imx_clk_gate("gpu_pll_out", > "gpu_pll_bypass", base + 0x64, 11); > clks[IMX8MM_VPU_PLL_OUT] = imx_clk_gate("vpu_pll_out", > "vpu_pll_bypass", base + 0x74, 11); > clks[IMX8MM_ARM_PLL_OUT] = imx_clk_gate("arm_pll_out", > "arm_pll_bypass", base + 0x84, 11); > - clks[IMX8MM_SYS_PLL1_OUT] = imx_clk_gate("sys_pll1_out", > "sys_pll1_bypass", base + 0x94, 11); > - clks[IMX8MM_SYS_PLL2_OUT] = imx_clk_gate("sys_pll2_out", > "sys_pll2_bypass", base + 0x104, 11); > + clks[IMX8MM_SYS_PLL1_OUT] = imx_clk_gate("sys_pll1_out", "sys_pll1", > base + 0x94, 11); > + clks[IMX8MM_SYS_PLL2_OUT] = imx_clk_gate("sys_pll2_out", "sys_pll2", > base + 0x104, 11); > clks[IMX8MM_SYS_PLL3_OUT] = imx_clk_gate("sys_pll3_out", > "sys_pll3_bypass", base + 0x114, 11); > > /* SYS PLL fixed output */ > -- > 2.16.4 >
