diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2011-12-05 07:57:50 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 10:59:22 +0200 |
| commit | 6d607141b3bfd6d07de11dc59ba00f154aa94bd9 (patch) | |
| tree | 1f6e143aed1b6990ead07beae3a54ede169f2658 /arch/arm/mach-ux500 | |
| parent | f1514c784a11b3ea0d03c670f081553f52ef616b (diff) | |
ARM: ux500: pm: Remove duplicated functionallity
prcmu power_state_result is nowadays provided from the prcmu
driver.
ST-Ericsson Linux next: -
ST-Ericsson ID: 370799
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: Idfff43b1c82bf0b1c03664359b1aea0a395a5d1a
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/40923
Diffstat (limited to 'arch/arm/mach-ux500')
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/pm.h | 16 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/pm/pm.c | 21 |
2 files changed, 1 insertions, 36 deletions
diff --git a/arch/arm/mach-ux500/include/mach/pm.h b/arch/arm/mach-ux500/include/mach/pm.h index b9fe3bbc8d7..d5fe29b6c88 100644 --- a/arch/arm/mach-ux500/include/mach/pm.h +++ b/arch/arm/mach-ux500/include/mach/pm.h @@ -10,14 +10,7 @@ #define PM_COMMON_H #ifdef CONFIG_PM -enum prcmu_idle_stat { - SLEEP_OK = 0xf3, - DEEP_SLEEP_OK = 0xf6, - IDLE_OK = 0xf0, - DEEPIDLE_OK = 0xe3, - PRCMU2ARMPENDINGIT_ER = 0x91, - ARMPENDINGIT_ER = 0x93, -}; +#include <linux/mfd/dbx500-prcmu.h> /** * ux500_pm_gic_decouple() @@ -90,13 +83,6 @@ u32 ux500_pm_gpio_read_wake_up_status(unsigned int bank_number); */ bool ux500_pm_other_cpu_wfi(void); -/** - * ux500_pm_prcmu_idle_stat() - * - * Returns the status of the last prcmu idle/sleep - */ -enum prcmu_idle_stat ux500_pm_prcmu_idle_stat(void); - struct dev_pm_domain; extern struct dev_pm_domain ux500_dev_power_domain; extern struct dev_pm_domain ux500_amba_dev_power_domain; diff --git a/arch/arm/mach-ux500/pm/pm.c b/arch/arm/mach-ux500/pm/pm.c index 14d496fbc51..604846021b7 100644 --- a/arch/arm/mach-ux500/pm/pm.c +++ b/arch/arm/mach-ux500/pm/pm.c @@ -215,24 +215,3 @@ bool ux500_pm_other_cpu_wfi(void) return false; } - -/* PRCM_ACK_MB0_AP_PWRSTTR_STATUS */ -#define DB8500_PRCMU_STATUS_REGISTER 0x801b8e08 -#define DB5500_PRCMU_STATUS_REGISTER 0x80168f38 - -enum prcmu_idle_stat ux500_pm_prcmu_idle_stat(void) -{ - u32 val; - void __iomem *prcmu_status_reg; - - if (cpu_is_u8500()) - prcmu_status_reg = __io_address(DB8500_PRCMU_STATUS_REGISTER); - else if (cpu_is_u5500()) - prcmu_status_reg = __io_address(DB5500_PRCMU_STATUS_REGISTER); - else - ux500_unknown_soc(); - - val = readl(prcmu_status_reg) & 0xff; - - return (enum prcmu_idle_stat)val; -} |