summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Aaberg <jonas.aberg@stericsson.com>2011-12-05 07:56:36 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 10:59:22 +0200
commitf1514c784a11b3ea0d03c670f081553f52ef616b (patch)
tree7c3c375b0d184405cb9549347a786fba012b8e8f
parent61b93ed2b7bb6cfd673d197b01e522dfb0645726 (diff)
ARM: ux500: suspend_dbg: obtain sleep status from prcmu driver
ST-Ericsson Linux next: - ST-Ericsson ID: 370799 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I5d7c207b963e1b99e2acd559d6393d244a2667ba Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/40921
-rw-r--r--arch/arm/mach-ux500/pm/suspend_dbg.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-ux500/pm/suspend_dbg.c b/arch/arm/mach-ux500/pm/suspend_dbg.c
index cd058bad91e..d6da667ae3b 100644
--- a/arch/arm/mach-ux500/pm/suspend_dbg.c
+++ b/arch/arm/mach-ux500/pm/suspend_dbg.c
@@ -15,6 +15,7 @@
#include <linux/debugfs.h>
#include <linux/seq_file.h>
#include <linux/uaccess.h>
+#include <linux/mfd/dbx500-prcmu.h>
#include <mach/pm.h>
@@ -69,23 +70,24 @@ bool ux500_suspend_deepsleep_enabled(void)
void ux500_suspend_dbg_sleep_status(bool is_deepsleep)
{
- enum prcmu_idle_stat prcmu_status;
+ enum prcmu_power_status prcmu_status;
- prcmu_status = ux500_pm_prcmu_idle_stat();
+ prcmu_status = prcmu_get_power_state_result();
if (is_deepsleep) {
pr_info("Returning from ApDeepSleep. PRCMU ret: 0x%x - %s\n",
prcmu_status,
- prcmu_status == DEEP_SLEEP_OK ? "Success" : "Fail!");
- if (prcmu_status == DEEP_SLEEP_OK)
+ prcmu_status == PRCMU_DEEP_SLEEP_OK ?
+ "Success" : "Fail!");
+ if (prcmu_status == PRCMU_DEEP_SLEEP_OK)
deepsleeps_done++;
else
deepsleeps_failed++;
} else {
pr_info("Returning from ApSleep. PRCMU ret: 0x%x - %s\n",
prcmu_status,
- prcmu_status == SLEEP_OK ? "Success" : "Fail!");
- if (prcmu_status == SLEEP_OK)
+ prcmu_status == PRCMU_SLEEP_OK ? "Success" : "Fail!");
+ if (prcmu_status == PRCMU_SLEEP_OK)
sleeps_done++;
else
sleeps_failed++;