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

Commit 4d193a66 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: msm: mdss: fix calculation of VCO rate during handoff" into msm-4.8

parents 45b59ce3 55d0e221

drivers/clk/qcom/mdss/mdss-dsi-pll-8998.c

+5 −5
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ static unsigned long dsi_pll_get_vco_rate(struct clk *c) 
		16);



	/* OUTDIV_1:0 field is (log(outdiv, 2)) */

	outdiv = MDSS_PLL_REG_R(pll->pll_base, PLL_OUTDIV);

	outdiv = MDSS_PLL_REG_R(pll->pll_base, PLL_PLL_OUTDIV_RATE);

	outdiv &= 0x3;

	outdiv = 1 << outdiv;
@@ -521,12 +521,12 @@ static unsigned long dsi_pll_get_vco_rate(struct clk *c) 
	multiplier = 1 << 18;

	pll_freq = dec * (ref_clk * 2);

	tmp64 = (ref_clk * 2 * frac);

	pll_freq += do_div(tmp64, multiplier);

	pll_freq += div_u64(tmp64, multiplier);



	vco_rate = do_div(pll_freq, outdiv);

	vco_rate = div_u64(pll_freq, outdiv);



	pr_debug("dec=0x%x\n, frac=0x%x, outdiv=%d, vco=%lu\n",

		 dec, frac, outdiv, (unsigned long)vco_rate);

	pr_debug("dec=0x%x, frac=0x%x, outdiv=%d, vco=%llu\n",

		 dec, frac, outdiv, vco_rate);



	(void)mdss_pll_resource_enable(pll, false);