Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c69f309f authored by Diptanshu Jamgade's avatar Diptanshu Jamgade Committed by Gerrit - the friendly Code Review server
Browse files

clk: qcom: clk-alpha: Reconfigure Fabia PLL during enable 



During enable read the L value to determine if the configuration
is required again, otherwise the PLL would fail to lock or enable
due to lost/missing values.

Change-Id: I062540185025e1357539c8b2f28a023ea4e050d4
Signed-off-by: default avatarDiptanshu Jamgade <djamgade@codeaurora.org>
parent ffdbf6ef

drivers/clk/qcom/clk-alpha-pll.c

+25 −4
Original line number Diff line number Diff line
@@ -1906,11 +1906,16 @@ static int clk_fabia_pll_latch_input(struct clk_alpha_pll *pll, 
	return ret;

}



void clk_fabia_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap,

int clk_fabia_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap,

				const struct alpha_pll_config *config)

{

	u32 val, mask;



	if (!config) {

		pr_err("PLL configuration missing.\n");

		return -EINVAL;

	}



	if (config->l)

		regmap_write(regmap, pll->offset + PLL_L_VAL,

						config->l);
@@ -1966,13 +1971,14 @@ void clk_fabia_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap, 
			   PLL_RESET_N, PLL_RESET_N);



	pll->inited = true;

	return 0;

}



static int clk_fabia_pll_enable(struct clk_hw *hw)

{

	int ret;

	struct clk_alpha_pll *pll = to_clk_alpha_pll(hw);

	u32 val, off = pll->offset;

	u32 val, off = pll->offset, l_val;



	ret = regmap_read(pll->clkr.regmap, off + PLL_MODE, &val);

	if (ret)
@@ -1986,8 +1992,23 @@ static int clk_fabia_pll_enable(struct clk_hw *hw) 
		return wait_for_pll_enable_active(pll);

	}



	if (unlikely(!pll->inited))

		clk_fabia_pll_configure(pll, pll->clkr.regmap, pll->config);

	ret = regmap_read(pll->clkr.regmap, pll->offset + PLL_L_VAL, &l_val);

	if (ret)

		return ret;



	/* PLL has lost it's L value, needs reconfiguration */

	if (!l_val)

		pll->inited = false;



	if (unlikely(!pll->inited)) {

		ret = clk_fabia_pll_configure(pll, pll->clkr.regmap,

				pll->config);

		if (ret) {

			pr_err("Failed to configure %s\n", clk_hw_get_name(hw));

			return ret;

		}

		pr_warn("PLL configuration lost, reconfiguration of PLL done.\n");

	}



	/* Disable PLL output */

	ret = regmap_update_bits(pll->clkr.regmap, off + PLL_MODE,

drivers/clk/qcom/clk-alpha-pll.h

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ int clk_trion_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap, 
				const struct alpha_pll_config *config);

int clk_regera_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap,

				const struct alpha_pll_config *config);

void clk_fabia_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap,

int clk_fabia_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap,

				const struct alpha_pll_config *config);

int clk_agera_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap,

				const struct alpha_pll_config *config);