summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrishna Sitaraman <ksitaraman@nvidia.com>2016-08-18 19:22:11 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2016-09-16 17:16:24 -0400
commitbca012dbc421e497ec59661f41659042efd1ce9c (patch)
treefbe0e3d7ceb2747d4a59b231363f6fd4be3082b5
parent0f52491c3cbaa91bc7f73ae3a58a21d264756b5d (diff)
t18x: cpuidle: pass upper bits of wake time
Only 24bits of the wake time is passed through psci. Pass the upper bits [31:8] instead of [23:0] to avoid wake time being capped at 524ms. Bug 1802357 Change-Id: I2ce3388feb168def48c6f65640916611f904c4d5 Signed-off-by: Krishna Sitaraman <ksitaraman@nvidia.com> Reviewed-on: http://git-master/r/1204690 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Mustafa Bilgen <mbilgen@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Alexander Van Brunt <avanbrunt@nvidia.com>
-rw-r--r--drivers/cpuidle/cpuidle-tegra18x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpuidle/cpuidle-tegra18x.c b/drivers/cpuidle/cpuidle-tegra18x.c
index b454a053a..c666efcd6 100644
--- a/drivers/cpuidle/cpuidle-tegra18x.c
+++ b/drivers/cpuidle/cpuidle-tegra18x.c
@@ -217,7 +217,7 @@ static u32 t18x_make_power_state(u32 state)
217 217
218 if (denver_testmode || a57_testmode) 218 if (denver_testmode || a57_testmode)
219 wake_time = 0xFFFFEEEE; 219 wake_time = 0xFFFFEEEE;
220 state = state | ((wake_time << 4) & PSCI_STATE_ID_WKTIM_MASK); 220 state = state | ((wake_time >> 4) & PSCI_STATE_ID_WKTIM_MASK);
221 221
222 return state; 222 return state;
223} 223}