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

Commit a423f3f3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: clk: qcom: fix recalc rate callback for 10nm DSI PLL"

parents 28732b62 dc65c97b
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -818,6 +818,19 @@ static unsigned long vco_10nm_recalc_rate(struct clk_hw *hw,
	if (!vco->priv)
		pr_err("vco priv is null\n");

	/*
	 * Calculate the vco rate from HW registers only for handoff cases.
	 * For other cases where a vco_10nm_set_rate() has already been
	 * called, just return the rate that was set earlier. This is due
	 * to the fact that recalculating VCO rate requires us to read the
	 * correct value of the pll_out_div divider clock, which is only set
	 * afterwards.
	 */
	if (pll->vco_current_rate != 0) {
		pr_debug("returning vco rate = %lld\n", pll->vco_current_rate);
		return pll->vco_current_rate;
	}

	rc = mdss_pll_resource_enable(pll, true);
	if (rc) {
		pr_err("failed to enable pll(%d) resource, rc=%d\n",