evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Linux Build Service Account 2016-11-14 21:54:06 -08:00 • committed by Gerrit - the friendly Code Review server
commit c93c8b05cc
2 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/clk/qcom/clk-alpha-pll.c
View file

@ -221,8 +221,6 @@ void clk_alpha_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap,
if (pll->flags & SUPPORTS_FSM_MODE) if (pll->flags & SUPPORTS_FSM_MODE)
clk_alpha_set_fsm_mode(pll); clk_alpha_set_fsm_mode(pll);
pll->inited = true;
} }
static int clk_alpha_pll_hwfsm_enable(struct clk_hw *hw) 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; u32 val, mask, off;
off = pll->offset; 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; mask = PLL_OUTCTRL | PLL_RESET_N | PLL_BYPASSNL;
ret = regmap_read(pll->clkr.regmap, off + PLL_MODE, &val); ret = regmap_read(pll->clkr.regmap, off + PLL_MODE, &val);
if (ret) if (ret)

1
drivers/clk/qcom/clk-alpha-pll.h
View file

@ -39,7 +39,6 @@ struct pll_vco {
struct clk_alpha_pll { struct clk_alpha_pll {
u32 offset; u32 offset;
struct pll_config *config; struct pll_config *config;
bool inited;
const struct pll_vco *vco_table; const struct pll_vco *vco_table;
size_t num_vco; size_t num_vco;