Merge "msm: mdss: fix pll stop sequence for msm8996 target" into msm-4.8 (21394af5) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/clk/qcom/mdss/mdss-dsi-pll-8996-util.c

+13 −1

Original line number	Diff line number	Diff line
		@@ -272,6 +272,7 @@ static void dsi_pll_disable(struct clk *c)
		{
		struct dsi_pll_vco_clk *vco = to_vco_clk(c);
		struct mdss_pll_resources *pll = vco->priv;
		struct mdss_pll_resources *slave;

		if (!pll->pll_on &&
		mdss_pll_resource_enable(pll, true)) {
		@@ -280,14 +281,25 @@ static void dsi_pll_disable(struct clk *c)
		}

		pll->handoff_resources = false;
		slave = pll->slave;

		dsi_pll_stop_8996(pll->pll_base);

		/* stop pll output */
		MDSS_PLL_REG_W(pll->pll_base, DSIPHY_PLL_CLKBUFLR_EN, 0);
		/* stop clk */
		MDSS_PLL_REG_W(pll->pll_base, DSIPHY_CMN_GLBL_TEST_CTRL, 0);
		/* stop digital block */
		MDSS_PLL_REG_W(pll->pll_base, DSIPHY_CMN_CTRL_0, 0x0);

		if (slave) {
		/* stop pll output */
		MDSS_PLL_REG_W(pll->pll_base, DSIPHY_PLL_CLKBUFLR_EN, 0);
		/* stop clk */
		MDSS_PLL_REG_W(pll->pll_base, DSIPHY_CMN_GLBL_TEST_CTRL, 0);
		/* stop digital block */
		MDSS_PLL_REG_W(pll->pll_base, DSIPHY_CMN_CTRL_0, 0x0);
		}

		mdss_pll_resource_enable(pll, false);