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

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

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

parents 72f543fb ecd1154f

drivers/power/qcom/apm.c

+10 −4
Original line number Diff line number Diff line
@@ -629,9 +629,15 @@ done: 
#define MSM8953_APCC_APM_MODE              0x000002a8

#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)

{

	int timeout = MSM_APM_SWITCH_TIMEOUT_US;

	int timeout = MSM8953_APM_SWITCH_TIMEOUT_US;

	u32 regval;

	int ret = 0;

	unsigned long flags;
@@ -648,7 +654,7 @@ static int msm8953_apm_switch_to_mx(struct msm_apm_ctrl_dev *ctrl_dev) 
	while (timeout > 0) {

		regval = readl_relaxed(ctrl_dev->reg_base +

					MSM8953_APCC_APM_CTL_STS);

		if ((regval & MSM_APM_CTL_STS_MASK) ==

		if ((regval & MSM8953_APM_CTL_STS_MASK) ==

				MSM8953_APM_MX_DONE_VAL)

			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)

{

	int timeout = MSM_APM_SWITCH_TIMEOUT_US;

	int timeout = MSM8953_APM_SWITCH_TIMEOUT_US;

	u32 regval;

	int ret = 0;

	unsigned long flags;
@@ -689,7 +695,7 @@ static int msm8953_apm_switch_to_apcc(struct msm_apm_ctrl_dev *ctrl_dev) 
	while (timeout > 0) {

		regval = readl_relaxed(ctrl_dev->reg_base +

					MSM8953_APCC_APM_CTL_STS);

		if ((regval & MSM_APM_CTL_STS_MASK) ==

		if ((regval & MSM8953_APM_CTL_STS_MASK) ==

				MSM8953_APM_APCC_DONE_VAL)

			break;