Skip to content

Commit a32da24

Browse files
Marek Vasutgregkh
Marek Vasut
authored andcommitted
clk: imx8mp: Fix clkout1/2 support
[ Upstream commit a9b7c84 ] The CLKOUTn may be fed from PLL1/2/3, but the PLL1/2/3 has to be enabled first by setting PLL_CLKE bit 11 in CCM_ANALOG_SYS_PLLn_GEN_CTRL register. The CCM_ANALOG_SYS_PLLn_GEN_CTRL bit 11 is modeled by plln_out clock. Fix the clock tree and place the clkout1/2 under plln_sel instead of plain plln to let the clock subsystem correctly control the bit 11 and enable the PLL in case the CLKOUTn is supplied by PLL1/2/3. Fixes: 43896f5 ("clk: imx8mp: add clkout1/2 support") Signed-off-by: Marek Vasut <[email protected]> Reviewed-by: Peng Fan <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Abel Vesa <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 3319beb commit a32da24

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/clk/imx/clk-imx8mp.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,9 @@ static const char * const imx8mp_dram_core_sels[] = {"dram_pll_out", "dram_alt_r
399399

400400
static const char * const imx8mp_clkout_sels[] = {"audio_pll1_out", "audio_pll2_out", "video_pll1_out",
401401
"dummy", "dummy", "gpu_pll_out", "vpu_pll_out",
402-
"arm_pll_out", "sys_pll1", "sys_pll2", "sys_pll3",
403-
"dummy", "dummy", "osc_24m", "dummy", "osc_32k"};
402+
"arm_pll_out", "sys_pll1_out", "sys_pll2_out",
403+
"sys_pll3_out", "dummy", "dummy", "osc_24m",
404+
"dummy", "osc_32k"};
404405

405406
static struct clk_hw **hws;
406407
static struct clk_hw_onecell_data *clk_hw_data;

0 commit comments

Comments
 (0)