diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2011-05-11 08:52:12 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:29 +0200 |
| commit | 9e6f3a9079615684480b6f9d35a6b03a04d235e9 (patch) | |
| tree | f07e3da04210b4b66fa68c82c76bbd45898dd605 /arch/arm/mach-ux500/pm/suspend_dbg.c | |
| parent | 84a2978e2620b2a3de23d0ae37a98f061d304767 (diff) | |
ARM: ux500: pm: Move prcmu idle status to pm
ST-Ericsson Linux next: ER338824
ST-Ericsson ID: ER338876
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I9ce7b492465e4a77570391545e31ca01a315a7d3
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23095
Reviewed-by: QATEST
Reviewed-by: Rickard ANDERSSON <rickard.andersson@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/pm/suspend_dbg.c')
| -rw-r--r-- | arch/arm/mach-ux500/pm/suspend_dbg.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/arch/arm/mach-ux500/pm/suspend_dbg.c b/arch/arm/mach-ux500/pm/suspend_dbg.c index 4b8e5e3a84f..ff6bb829539 100644 --- a/arch/arm/mach-ux500/pm/suspend_dbg.c +++ b/arch/arm/mach-ux500/pm/suspend_dbg.c @@ -17,13 +17,7 @@ #include <linux/seq_file.h> #include <linux/uaccess.h> -#define DEEP_SLEEP_OK 0xf6 -#define SLEEP_OK 0xf3 - -#define PRCMU_STATUS_REGISTER_V1 0x8015fe08 -#define PRCMU_STATUS_REGISTER_V2 0x801b8e08 - -static void __iomem *prcmu_status_reg; +#include "pm.h" #ifdef CONFIG_UX500_SUSPEND_STANDBY static u32 sleep_enabled = 1; @@ -76,9 +70,9 @@ bool ux500_suspend_deepsleep_enabled(void) void ux500_suspend_dbg_sleep_status(bool is_deepsleep) { - u32 prcmu_status; + enum prcmu_idle_stat prcmu_status; - prcmu_status = readl(prcmu_status_reg) & 0xff; + prcmu_status = ux500_pm_prcmu_idle_stat(); if (is_deepsleep) { pr_info("Returning from ApDeepSleep. PRCMU ret: 0x%x - %s\n", @@ -117,12 +111,6 @@ void ux500_suspend_dbg_init(void) struct dentry *sleeps_failed_file = NULL; struct dentry *deepsleeps_failed_file = NULL; - - if (cpu_is_u8500v20_or_later()) - prcmu_status_reg = (void *)IO_ADDRESS(PRCMU_STATUS_REGISTER_V2); - else - prcmu_status_reg = (void *)IO_ADDRESS(PRCMU_STATUS_REGISTER_V1); - suspend_dir = debugfs_create_dir("suspend", NULL); if (IS_ERR_OR_NULL(suspend_dir)) return; |