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

Commit 5c5c02f8 authored by Taniya Das's avatar Taniya Das Committed by Gerrit - the friendly Code Review server
Browse files

clk: qcom: alpha: Remove usage of pll->inited flag for Lucid 



The PLL configuration if required should be invoked by the consumer of the
pll before using it. So remove any re-configuration code in clk_enable
path.

Change-Id: Id0149dd51951d826ff9fba575b556df780715718
Signed-off-by: default avatarTaniya Das <tdas@codeaurora.org>
parent ee9b982a

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

+0 −25
Original line number Diff line number Diff line
@@ -2341,22 +2341,6 @@ int clk_lucid_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap, 
{

	int ret;



	if (lucid_pll_is_enabled(pll, regmap)) {

		pr_warn("PLL is already enabled. Skipping configuration.\n");

		return 0;

	}



	/*

	 * Disable the PLL if it's already been initialized. Not doing so might

	 * lead to the PLL running with the old frequency configuration.

	 */

	if (pll->inited) {

		ret = regmap_update_bits(regmap, pll->offset + PLL_MODE,

						PLL_RESET_N, 0);

		if (ret)

			return ret;

	}



	if (config->l)

		regmap_write(regmap, pll->offset + LUCID_PLL_OFF_L_VAL,

				config->l);
@@ -2428,15 +2412,6 @@ static int alpha_pll_lucid_enable(struct clk_hw *hw) 
		return wait_for_pll_enable_active(pll);

	}



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

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

						pll->config);

		if (ret) {

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

			return ret;

		}

	}



	/* Set operation mode to RUN */

	regmap_write(pll->clkr.regmap, pll->offset + LUCID_PLL_OFF_OPMODE,

				LUCID_PLL_RUN);