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

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

Merge "msm: mdss: fix vreg pre/post on/off wait duration"

parents 73799d64 c3e21671

drivers/video/msm/mdss/mdss_io_util.c

+12 −12
Original line number Diff line number Diff line
@@ -223,8 +223,8 @@ int msm_dss_enable_vreg(struct dss_vreg *in_vreg, int num_vreg, int enable) 
			}

			need_sleep = !regulator_is_enabled(in_vreg[i].vreg);

			if (in_vreg[i].pre_on_sleep && need_sleep)

				usleep_range(in_vreg[i].pre_on_sleep,

					in_vreg[i].pre_on_sleep);

				usleep_range(in_vreg[i].pre_on_sleep * 1000,

					in_vreg[i].pre_on_sleep * 1000);

			rc = regulator_set_optimum_mode(in_vreg[i].vreg,

				in_vreg[i].enable_load);

			if (rc < 0) {
@@ -235,8 +235,8 @@ int msm_dss_enable_vreg(struct dss_vreg *in_vreg, int num_vreg, int enable) 
			}

			rc = regulator_enable(in_vreg[i].vreg);

			if (in_vreg[i].post_on_sleep && need_sleep)

				usleep_range(in_vreg[i].post_on_sleep,

					in_vreg[i].post_on_sleep);

				usleep_range(in_vreg[i].post_on_sleep * 1000,

					in_vreg[i].post_on_sleep * 1000);

			if (rc < 0) {

				DEV_ERR("%pS->%s: %s enable failed\n",

					__builtin_return_address(0), __func__,
@@ -247,14 +247,14 @@ int msm_dss_enable_vreg(struct dss_vreg *in_vreg, int num_vreg, int enable) 
	} else {

		for (i = num_vreg-1; i >= 0; i--) {

			if (in_vreg[i].pre_off_sleep)

				usleep_range(in_vreg[i].pre_off_sleep,

					in_vreg[i].pre_off_sleep);

				usleep_range(in_vreg[i].pre_off_sleep * 1000,

					in_vreg[i].pre_off_sleep * 1000);

			regulator_set_optimum_mode(in_vreg[i].vreg,

				in_vreg[i].disable_load);

			regulator_disable(in_vreg[i].vreg);

			if (in_vreg[i].post_off_sleep)

				usleep_range(in_vreg[i].post_off_sleep,

					in_vreg[i].post_off_sleep);

				usleep_range(in_vreg[i].post_off_sleep * 1000,

					in_vreg[i].post_off_sleep * 1000);

		}

	}

	return rc;
@@ -265,14 +265,14 @@ disable_vreg: 
vreg_set_opt_mode_fail:

	for (i--; i >= 0; i--) {

		if (in_vreg[i].pre_off_sleep)

			usleep_range(in_vreg[i].pre_off_sleep,

				in_vreg[i].pre_off_sleep);

			usleep_range(in_vreg[i].pre_off_sleep * 1000,

				in_vreg[i].pre_off_sleep * 1000);

		regulator_set_optimum_mode(in_vreg[i].vreg,

			in_vreg[i].disable_load);

		regulator_disable(in_vreg[i].vreg);

		if (in_vreg[i].post_off_sleep)

			usleep_range(in_vreg[i].post_off_sleep,

				in_vreg[i].post_off_sleep);

			usleep_range(in_vreg[i].post_off_sleep * 1000,

				in_vreg[i].post_off_sleep * 1000);

	}



	return rc;