diff options
author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2012-01-24 23:56:07 (GMT) |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-02-03 12:42:19 (GMT) |
commit | b59160f6c017bfe33d3483ed9a6120701644af8a (patch) | |
tree | bebbb2ac6ff9aa7073874141816163bf1ba4824b | |
parent | fa50ae9c100225964eafc7214c70a8c08e70e50e (diff) | |
download | linux-fsl-qoriq-b59160f6c017bfe33d3483ed9a6120701644af8a.tar.xz |
ARM: at91: remove wait_for_interrupt definition
All the "wait_for_interrupt" definition are aliases to cpu_do_idle.
Only the rm9200 has an asm routine to switch to wfi. But the cpu_do_idle
for this platform has exactly the same asm routine.
arch/arm/mm/proc-arm920.S
..
ENTRY(cpu_arm920_do_idle)
mcr p15, 0, r0, c7, c0, 4 @ Wait for interrupt
..
Then it is safe to invoke cpu_do_idle for this platform. As all the
wait_for_interrupts are definition for cpu_do_idle, let's remove it
and replace its invokation by cpu_do_idle.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
-rw-r--r-- | arch/arm/mach-at91/pm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/pm.h | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 87be5aa..d7e8d4c 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -262,7 +262,7 @@ static int at91_pm_enter(suspend_state_t state) : /* no input */ : "r0"); saved_lpr = sdram_selfrefresh_enable(); - wait_for_interrupt_enable(); + cpu_do_idle(); sdram_selfrefresh_disable(saved_lpr); break; diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h index 715813e..38f9a13 100644 --- a/arch/arm/mach-at91/pm.h +++ b/arch/arm/mach-at91/pm.h @@ -36,10 +36,6 @@ static inline u32 sdram_selfrefresh_enable(void) #define sdram_selfrefresh_disable(saved_lpr) \ at91_sys_write(AT91_SDRAMC_LPR, saved_lpr) -#define wait_for_interrupt_enable() \ - asm volatile ("mcr p15, 0, %0, c7, c0, 4" \ - : : "r" (0)) - #elif defined(CONFIG_ARCH_AT91SAM9G45) #include <mach/at91sam9_ddrsdr.h> @@ -76,8 +72,6 @@ static inline u32 sdram_selfrefresh_enable(void) at91_ramc_write(1, AT91_DDRSDRC_LPR, saved_lpr1); \ } while (0) -#define wait_for_interrupt_enable() cpu_do_idle() - #else #include <mach/at91sam9_sdramc.h> @@ -104,9 +98,6 @@ static inline u32 sdram_selfrefresh_enable(void) #define sdram_selfrefresh_disable(saved_lpr) \ at91_ramc_write(0, AT91_SDRAMC_LPR, saved_lpr) -#define wait_for_interrupt_enable() \ - cpu_do_idle() - #endif #endif |