Skip to content

Commit

Permalink
msm: mdss: Replace msleep() with usleep()
Browse files Browse the repository at this point in the history
Replace msleep() with usleep() in the display's voltage regulator
enable/disable

Signed-off-by: Bang Nguyen <bnguyen1@motorola.com>
  • Loading branch information
Bang Nguyen authored and javilonas committed Jun 9, 2015
1 parent 283d475 commit 1999613
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions drivers/video/msm/mdss/mdss_io_util.c
Expand Up @@ -224,7 +224,9 @@ int msm_dss_enable_vreg(struct dss_vreg *in_vreg, int num_vreg, int enable)
goto vreg_set_opt_mode_fail;
}
if (in_vreg[i].pre_on_sleep)
msleep(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) {
Expand All @@ -235,7 +237,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)
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__,
Expand All @@ -247,12 +250,17 @@ int msm_dss_enable_vreg(struct dss_vreg *in_vreg, int num_vreg, int enable)
for (i = num_vreg-1; i >= 0; i--)
if (regulator_is_enabled(in_vreg[i].vreg)) {
if (in_vreg[i].pre_off_sleep)
msleep(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)
msleep(in_vreg[i].post_off_sleep);
usleep_range(
in_vreg[i].post_off_sleep * 1000,
in_vreg[i].post_off_sleep * 1000);
}
}
return rc;
Expand Down

0 comments on commit 1999613

Please sign in to comment.