summaryrefslogtreecommitdiff
path: root/arch/arm/mach-at91/pm.h
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2011-11-15 22:58:31 +0400
committerNicolas Ferre <nicolas.ferre@atmel.com>2012-02-23 12:26:41 +0400
commit1a269ade22bb65d0afc0d20e0a19602453fae04a (patch)
treedaeb2b7a7f4d0d01ea16824d1d64bba34a339004 /arch/arm/mach-at91/pm.h
parent8ff12ad3df62ee343d5f5ec29572b9d2c5c2cedd (diff)
downloadlinux-1a269ade22bb65d0afc0d20e0a19602453fae04a.tar.xz
ARM: at91: move at91rm9200 sdramc defines to at91rm9200_sdramc.h
This cleanup is done to allow to have multiple SoC in the same image. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/pm.h')
-rw-r--r--arch/arm/mach-at91/pm.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h
index bba9ce1aaaec..41cdd2beb1ec 100644
--- a/arch/arm/mach-at91/pm.h
+++ b/arch/arm/mach-at91/pm.h
@@ -13,6 +13,7 @@
#ifdef CONFIG_ARCH_AT91RM9200
#include <mach/at91rm9200_mc.h>
+#include <mach/at91rm9200_sdramc.h>
/*
* The AT91RM9200 goes into self-refresh mode with this command, and will
@@ -26,7 +27,7 @@
static inline void at91rm9200_standby(void)
{
- u32 lpr = at91_sys_read(AT91_SDRAMC_LPR);
+ u32 lpr = at91_sys_read(AT91RM9200_SDRAMC_LPR);
asm volatile(
"b 1f\n\t"
@@ -37,8 +38,8 @@ static inline void at91rm9200_standby(void)
" mcr p15, 0, %0, c7, c0, 4\n\t"
" str %5, [%1, %2]"
:
- : "r" (0), "r" (AT91_BASE_SYS), "r" (AT91_SDRAMC_LPR),
- "r" (1), "r" (AT91_SDRAMC_SRR),
+ : "r" (0), "r" (AT91_BASE_SYS), "r" (AT91RM9200_SDRAMC_LPR),
+ "r" (1), "r" (AT91RM9200_SDRAMC_SRR),
"r" (lpr));
}