aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2015-03-16 18:44:38 -0400
committerNicolas Ferre <nicolas.ferre@atmel.com>2015-04-05 15:59:52 -0400
commit2e57dc087c27b8b0bd4a9e5f2c6f28f3cd0b47ff (patch)
tree859595f2a14be601173a52a41f0e41c450075998
parenta18d0699dd18ba5661c321ebd67e6056656b6765 (diff)
ARM: at91/pm: move AT91_MEMCTRL_* to pm.h
the AT91_MEMCTRL_* defines are only used by the pm code, move them to pm.h Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
-rw-r--r--arch/arm/mach-at91/include/mach/at91_ramc.h4
-rw-r--r--arch/arm/mach-at91/pm.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91_ramc.h b/arch/arm/mach-at91/include/mach/at91_ramc.h
index e4492b151fee..493bc486e858 100644
--- a/arch/arm/mach-at91/include/mach/at91_ramc.h
+++ b/arch/arm/mach-at91/include/mach/at91_ramc.h
@@ -21,10 +21,6 @@ extern void __iomem *at91_ramc_base[];
21.extern at91_ramc_base 21.extern at91_ramc_base
22#endif 22#endif
23 23
24#define AT91_MEMCTRL_MC 0
25#define AT91_MEMCTRL_SDRAMC 1
26#define AT91_MEMCTRL_DDRSDR 2
27
28#include <soc/at91/at91rm9200_sdramc.h> 24#include <soc/at91/at91rm9200_sdramc.h>
29#include <soc/at91/at91sam9_ddrsdr.h> 25#include <soc/at91/at91sam9_ddrsdr.h>
30#include <soc/at91/at91sam9_sdramc.h> 26#include <soc/at91/at91sam9_sdramc.h>
diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h
index 3223967d3460..ecd875a91d52 100644
--- a/arch/arm/mach-at91/pm.h
+++ b/arch/arm/mach-at91/pm.h
@@ -15,6 +15,10 @@
15 15
16#include <mach/at91_ramc.h> 16#include <mach/at91_ramc.h>
17 17
18#define AT91_MEMCTRL_MC 0
19#define AT91_MEMCTRL_SDRAMC 1
20#define AT91_MEMCTRL_DDRSDR 2
21
18#define AT91_PM_MEMTYPE_MASK 0x0f 22#define AT91_PM_MEMTYPE_MASK 0x0f
19 23
20#define AT91_PM_MODE_OFFSET 4 24#define AT91_PM_MODE_OFFSET 4