Merge "clk: qcom: Use the saved current frequency for enable_safe_config"

This commit is contained in:
Linux Build Service Account 2017-03-03 17:39:28 -08:00 committed by Gerrit - the friendly Code Review server
commit 743e265eb5

View file

@ -513,7 +513,7 @@ static int clk_rcg2_enable(struct clk_hw *hw)
* is always on while APPS is online. Therefore, the RCG can safely be
* switched.
*/
rate = clk_get_rate(hw->clk);
rate = rcg->current_freq;
f = qcom_find_freq(rcg->freq_tbl, rate);
if (!f)
return -EINVAL;
@ -627,6 +627,9 @@ static int __clk_rcg2_set_rate(struct clk_hw *hw, unsigned long rate)
rcg->new_index, false);
}
/* Update current frequency with the frequency requested. */
rcg->current_freq = rate;
return ret;
}