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

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

Merge "Revert "msm: mdss: fix NOC error issue on mdss-pll""

parents 89ef6686 15c54a16

drivers/clk/msm/mdss/mdss-pll.c

+0 −3
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ int mdss_pll_resource_enable(struct mdss_pll_resources *pll_res, bool enable) 
		return rc;

	}



	mutex_lock(&pll_res->mutex);

	if (enable) {

		if (pll_res->resource_ref_cnt == 0)

			changed++;
@@ -66,7 +65,6 @@ int mdss_pll_resource_enable(struct mdss_pll_resources *pll_res, bool enable) 
		else

			pll_res->resource_enable = enable;

	}

	mutex_unlock(&pll_res->mutex);



	return rc;

}
@@ -336,7 +334,6 @@ static int mdss_pll_probe(struct platform_device *pdev) 
		goto gdsc_io_error;

	}



	mutex_init(&pll_res->mutex);

	rc = mdss_pll_resource_init(pdev, pll_res);

	if (rc) {

		pr_err("Pll ndx=%d resource init failed rc=%d\n",

drivers/clk/msm/mdss/mdss-pll.h

+0 −2
Original line number Diff line number Diff line
@@ -184,8 +184,6 @@ struct mdss_pll_resources { 
	 */

	struct dfps_info *dfps;



	struct mutex mutex;



};



struct mdss_pll_vco_calc {