Commit d4c83ac1 authored by Dmitry Rokosov's avatar Dmitry Rokosov Committed by Jerome Brunet
Browse files

clk: meson: add 'NOINIT_ENABLED' flag to eliminate init for enabled PLL 



When dealing with certain PLLs, it is necessary to avoid modifying them
if they have already been initialized by lower levels. For instance, in
the A1 SoC Family, the sys_pll is enabled as the parent for the cpuclk,
and it cannot be disabled during the initialization sequence. Therefore,
initialization phase must be skipped.

Signed-off-by: default avatarDmitry Rokosov <ddrokosov@salutedevices.com>
Link: https://lore.kernel.org/r/20240515185103.20256-2-ddrokosov@salutedevices.com


Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
parent f06ac3ed

drivers/clk/meson/clk-pll.c

+24 −16
Original line number Diff line number Diff line
@@ -289,11 +289,35 @@ static int meson_clk_pll_wait_lock(struct clk_hw *hw) 
	return -ETIMEDOUT;

}



static int meson_clk_pll_is_enabled(struct clk_hw *hw)

{

	struct clk_regmap *clk = to_clk_regmap(hw);

	struct meson_clk_pll_data *pll = meson_clk_pll_data(clk);



	if (MESON_PARM_APPLICABLE(&pll->rst) &&

	    meson_parm_read(clk->map, &pll->rst))

		return 0;



	if (!meson_parm_read(clk->map, &pll->en) ||

	    !meson_parm_read(clk->map, &pll->l))

		return 0;



	return 1;

}



static int meson_clk_pll_init(struct clk_hw *hw)

{

	struct clk_regmap *clk = to_clk_regmap(hw);

	struct meson_clk_pll_data *pll = meson_clk_pll_data(clk);



	/*

	 * Keep the clock running, which was already initialized and enabled

	 * from the bootloader stage, to avoid any glitches.

	 */

	if ((pll->flags & CLK_MESON_PLL_NOINIT_ENABLED) &&

	    meson_clk_pll_is_enabled(hw))

		return 0;



	if (pll->init_count) {

		if (MESON_PARM_APPLICABLE(&pll->rst))

			meson_parm_write(clk->map, &pll->rst, 1);
@@ -308,22 +332,6 @@ static int meson_clk_pll_init(struct clk_hw *hw) 
	return 0;

}



static int meson_clk_pll_is_enabled(struct clk_hw *hw)

{

	struct clk_regmap *clk = to_clk_regmap(hw);

	struct meson_clk_pll_data *pll = meson_clk_pll_data(clk);



	if (MESON_PARM_APPLICABLE(&pll->rst) &&

	    meson_parm_read(clk->map, &pll->rst))

		return 0;



	if (!meson_parm_read(clk->map, &pll->en) ||

	    !meson_parm_read(clk->map, &pll->l))

		return 0;



	return 1;

}



static int meson_clk_pcie_pll_enable(struct clk_hw *hw)

{

	int retries = 10;

drivers/clk/meson/clk-pll.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ struct pll_mult_range { 
	}



#define CLK_MESON_PLL_ROUND_CLOSEST	BIT(0)

#define CLK_MESON_PLL_NOINIT_ENABLED	BIT(1)



struct meson_clk_pll_data {

	struct parm en;