diff options
| author | Clarence Ip <cip@codeaurora.org> | 2016-02-23 18:01:09 -0500 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:47:51 -0700 |
| commit | c02ceba378e54cf86401936f8e7aef2072ab1692 (patch) | |
| tree | a1147b1f621d433f572a27790b28756331f08d69 /drivers/video/fbdev | |
| parent | 603de610eef28ed48e445dfe48b4d0a1efe60703 (diff) | |
msm: mdss: fix vreg pre/post on/off wait duration
Commit be5fd56b0dbcb6a80b0e0322e77a1d368a840746 ("msm:
mdss: use usleep_range instead of msleep in mdss util")
replaces the msleep with usleep_range but does not fix
the sleep duration. That leads to invalid wait time
after vreg pre/post on/off operation.
Change-Id: I47ae12eda393fd6367e7045a9bd91add3bb4a942
Signed-off-by: Dhaval Patel <pdhaval@codeaurora.org>
[cip@codeaurora.org: Resolved merge conflicts]
Signed-off-by: Clarence Ip <cip@codeaurora.org>
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_io_util.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/video/fbdev/msm/mdss_io_util.c b/drivers/video/fbdev/msm/mdss_io_util.c index 778b48591b86..185f7be4dadf 100644 --- a/drivers/video/fbdev/msm/mdss_io_util.c +++ b/drivers/video/fbdev/msm/mdss_io_util.c @@ -224,8 +224,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_load(in_vreg[i].vreg, in_vreg[i].enable_load); if (rc < 0) { @@ -236,8 +236,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__, @@ -248,14 +248,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_load(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; @@ -266,14 +266,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_load(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; |