aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhushboo Bindlish <khushboo.bindlish@intel.com>2016-05-04 21:41:27 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-04 21:41:27 +0000
commit577b182b36ff4e71f7d2ed3abba9500e32f5b061 (patch)
tree88eed503919f30d6fa7f4d3d23fd515183ffbec3
parent9db6f62b110c1ee129859f4620e3566e14eddb97 (diff)
parent3eccfae5bcffd92126dd3c8c7700311c30cdd9fb (diff)
downloadedison-v3.10-577b182b36ff4e71f7d2ed3abba9500e32f5b061.tar.gz
Do not turn off Chaabi during PMU initialization
am: 3eccfae5bc * commit '3eccfae5bcffd92126dd3c8c7700311c30cdd9fb': Do not turn off Chaabi during PMU initialization Change-Id: I9984c0dc4f84b33f77f7354456e6f1bea111ec0f
-rw-r--r--arch/x86/platform/intel-mid/intel_soc_mrfld.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/platform/intel-mid/intel_soc_mrfld.c b/arch/x86/platform/intel-mid/intel_soc_mrfld.c
index 0683935f387..9e125f10dfe 100644
--- a/arch/x86/platform/intel-mid/intel_soc_mrfld.c
+++ b/arch/x86/platform/intel-mid/intel_soc_mrfld.c
@@ -51,7 +51,7 @@ static int mrfld_pmu_init(void)
/* Put all unused LSS in D0i3 */
mid_pmu_cxt->os_sss[0] = (SSMSK(D0I3_MASK, PMU_RESERVED_LSS_03) |
SSMSK(D0I3_MASK, PMU_HSI_LSS_05) |
- SSMSK(D0I3_MASK, PMU_SECURITY_LSS_06) |
+ //SSMSK(D0I3_MASK, PMU_SECURITY_LSS_06) |
SSMSK(D0I3_MASK, PMU_RESERVED_LSS_07) |
SSMSK(D0I3_MASK, PMU_RESERVED_LSS_11) |
SSMSK(D0I3_MASK, PMU_RESERVED_LSS_12) |
@@ -234,7 +234,7 @@ void platform_update_all_lss_states(struct pmu_ss_states *pmu_config,
pmu_config->pmu2_states[0] =
(SSMSK(D0I3_MASK, PMU_RESERVED_LSS_03) |
SSMSK(D0I3_MASK, PMU_HSI_LSS_05) |
- SSMSK(D0I3_MASK, PMU_SECURITY_LSS_06) |
+ //SSMSK(D0I3_MASK, PMU_SECURITY_LSS_06) |
SSMSK(D0I3_MASK, PMU_RESERVED_LSS_07) |
SSMSK(D0I3_MASK, PMU_RESERVED_LSS_11) |
SSMSK(D0I3_MASK, PMU_RESERVED_LSS_12) |