msm: htcleo: set the same pm2 properties as in .35 kernel

Signed-off-by: Marc Alexander <admin@m-a-styles.de>
marc1706 · May 21, 2013 · e2d3ffd · e2d3ffd
1 parent 6b8a8ed
commit e2d3ffd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/arch/arm/mach-msm/board-htcleo.c b/arch/arm/mach-msm/board-htcleo.c
@@ -962,6 +962,7 @@ static struct msm_pm_platform_data msm_pm_data[MSM_PM_SLEEP_MODE_NR] = {
 		.latency = 8594,
 		.residency = 23740,
 	},
+#if 0
 	[MSM_PM_SLEEP_MODE_APPS_SLEEP] = {
 		.idle_supported = 1,
 		.suspend_supported = 1,
@@ -970,7 +971,6 @@ static struct msm_pm_platform_data msm_pm_data[MSM_PM_SLEEP_MODE_NR] = {
 		.latency = 8594,
 		.residency = 23740,
 	},
-/*
 	[MSM_PM_SLEEP_MODE_POWER_COLLAPSE_NO_XO_SHUTDOWN] = {
 		.idle_supported = 1,
 		.suspend_supported = 1,
@@ -995,6 +995,7 @@ static struct msm_pm_platform_data msm_pm_data[MSM_PM_SLEEP_MODE_NR] = {
 		.latency = 500,
 		.residency = 6000,
 	},
+#endif
 	[MSM_PM_SLEEP_MODE_RAMP_DOWN_AND_WAIT_FOR_INTERRUPT] = {
 		.idle_supported = 1,
 		.suspend_supported = 1,

diff --git a/arch/arm/mach-msm/pm2.c b/arch/arm/mach-msm/pm2.c
@@ -89,7 +89,7 @@ module_param_array_named(offalarm, offalarm, uint, &offalarm_size,
 			S_IRUGO | S_IWUSR);
 #endif
 
-static int msm_pm_debug_mask = MSM_PM_DEBUG_CLOCK | MSM_PM_DEBUG_WAKEUP_REASON;
+static int msm_pm_debug_mask = MSM_PM_DEBUG_CLOCK | MSM_PM_DEBUG_WAKEUP_REASON | MSM_PM_DEBUG_SUSPEND | MSM_PM_DEBUG_POWER_COLLAPSE;
 module_param_named(
 	debug_mask, msm_pm_debug_mask, int, S_IRUGO | S_IWUSR | S_IWGRP
 );