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

Merge "clk: qcom: Fix for rate request to RPM during handoff"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-13 08:07:51 -08:00 • committed by Gerrit - the friendly Code Review server
commit b9fd387cd6
1 changed files with 5 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/clk/qcom/clk-smd-rpm.c
View file

@ -185,28 +185,7 @@ static int clk_smd_rpm_prepare(struct clk_hw *hw);
static int clk_smd_rpm_handoff(struct clk_hw *hw)
{
int ret = 0;
uint32_t value = cpu_to_le32(INT_MAX);
struct clk_smd_rpm *r = to_clk_smd_rpm(hw);
struct msm_rpm_kvp req = {
.key = cpu_to_le32(r->rpm_key),
.data = (void *)&value,
.length = sizeof(value),
};
ret = msm_rpm_send_message(QCOM_SMD_RPM_ACTIVE_STATE, r->rpm_res_type,
r->rpm_clk_id, &req, 1);
if (ret)
return ret;
ret = msm_rpm_send_message(QCOM_SMD_RPM_SLEEP_STATE, r->rpm_res_type,
r->rpm_clk_id, &req, 1);
if (ret)
return ret;
ret = clk_smd_rpm_prepare(hw);
return ret;
return clk_smd_rpm_prepare(hw);
}
static int clk_smd_rpm_set_rate_active(struct clk_smd_rpm *r,
@ -282,12 +261,12 @@ static int clk_smd_rpm_prepare(struct clk_hw *hw)
mutex_lock(&rpm_smd_clk_lock);
/* Don't send requests to the RPM if the rate has not been set. */
if (!r->rate)
goto out;
to_active_sleep(r, r->rate, &this_rate, &this_sleep_rate);
/* Don't send requests to the RPM if the rate has not been set. */
if (this_rate == 0)
goto out;
/* Take peer clock's rate into account only if it's enabled. */
if (peer->enabled)
to_active_sleep(peer, peer->rate,