Merge "clk: qcom: Remove initial configuration from PLL enable function"

2 files changed, 0 insertions, 9 deletions

diff --git a/drivers/clk/qcom/clk-alpha-pll.c b/drivers/clk/qcom/clk-alpha-pll.c
index 1501c5da4a6c..085b9acfb9d5 100644
--- a/drivers/clk/qcom/clk-alpha-pll.c
+++ b/drivers/clk/qcom/clk-alpha-pll.c
@@ -221,8 +221,6 @@ void clk_alpha_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap,
 
 	if (pll->flags & SUPPORTS_FSM_MODE)
 		clk_alpha_set_fsm_mode(pll);
-
-	pll->inited = true;
 }
 
 static int clk_alpha_pll_hwfsm_enable(struct clk_hw *hw)
@@ -288,12 +286,6 @@ static int clk_alpha_pll_enable(struct clk_hw *hw)
 	u32 val, mask, off;
 
 	off = pll->offset;
-
-	if (unlikely(!pll->inited)) {
-		clk_alpha_pll_configure(pll, pll->clkr.regmap,
-					pll->config);
-	}
-
 	mask = PLL_OUTCTRL | PLL_RESET_N | PLL_BYPASSNL;
 	ret = regmap_read(pll->clkr.regmap, off + PLL_MODE, &val);
 	if (ret)
diff --git a/drivers/clk/qcom/clk-alpha-pll.h b/drivers/clk/qcom/clk-alpha-pll.h
index 425cf3afef9e..9b1d3ee61cac 100644
--- a/drivers/clk/qcom/clk-alpha-pll.h
+++ b/drivers/clk/qcom/clk-alpha-pll.h
@@ -39,7 +39,6 @@ struct pll_vco {
 struct clk_alpha_pll {
 	u32 offset;
 	struct pll_config *config;
-	bool inited;
 
 	const struct pll_vco *vco_table;
 	size_t num_vco;