evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "power: qcom: Modify APM timeout value for msm8953"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-21 13:28:53 -07:00 • committed by Gerrit - the friendly Code Review server
commit 9f7e569e9f
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/power/qcom/apm.c
View file

@ -629,9 +629,15 @@ done:
#define MSM8953_APCC_APM_MODE 0x000002a8 #define MSM8953_APCC_APM_MODE 0x000002a8
#define MSM8953_APCC_APM_CTL_STS 0x000002b0 #define MSM8953_APCC_APM_CTL_STS 0x000002b0
/* 8953 constants */
#define MSM8953_APM_SWITCH_TIMEOUT_US 500
/* Register bit mask definitions */
#define MSM8953_APM_CTL_STS_MASK 0x1f
static int msm8953_apm_switch_to_mx(struct msm_apm_ctrl_dev *ctrl_dev) static int msm8953_apm_switch_to_mx(struct msm_apm_ctrl_dev *ctrl_dev)
{ {
int timeout = MSM_APM_SWITCH_TIMEOUT_US; int timeout = MSM8953_APM_SWITCH_TIMEOUT_US;
u32 regval; u32 regval;
int ret = 0; int ret = 0;
unsigned long flags; unsigned long flags;
@ -648,7 +654,7 @@ static int msm8953_apm_switch_to_mx(struct msm_apm_ctrl_dev *ctrl_dev)
while (timeout > 0) { while (timeout > 0) {
regval = readl_relaxed(ctrl_dev->reg_base + regval = readl_relaxed(ctrl_dev->reg_base +
MSM8953_APCC_APM_CTL_STS); MSM8953_APCC_APM_CTL_STS);
if ((regval & MSM_APM_CTL_STS_MASK) == if ((regval & MSM8953_APM_CTL_STS_MASK) ==
MSM8953_APM_MX_DONE_VAL) MSM8953_APM_MX_DONE_VAL)
break; break;
@ -672,7 +678,7 @@ static int msm8953_apm_switch_to_mx(struct msm_apm_ctrl_dev *ctrl_dev)
static int msm8953_apm_switch_to_apcc(struct msm_apm_ctrl_dev *ctrl_dev) static int msm8953_apm_switch_to_apcc(struct msm_apm_ctrl_dev *ctrl_dev)
{ {
int timeout = MSM_APM_SWITCH_TIMEOUT_US; int timeout = MSM8953_APM_SWITCH_TIMEOUT_US;
u32 regval; u32 regval;
int ret = 0; int ret = 0;
unsigned long flags; unsigned long flags;
@ -689,7 +695,7 @@ static int msm8953_apm_switch_to_apcc(struct msm_apm_ctrl_dev *ctrl_dev)
while (timeout > 0) { while (timeout > 0) {
regval = readl_relaxed(ctrl_dev->reg_base + regval = readl_relaxed(ctrl_dev->reg_base +
MSM8953_APCC_APM_CTL_STS); MSM8953_APCC_APM_CTL_STS);
if ((regval & MSM_APM_CTL_STS_MASK) == if ((regval & MSM8953_APM_CTL_STS_MASK) ==
MSM8953_APM_APCC_DONE_VAL) MSM8953_APM_APCC_DONE_VAL)
break; break;