diff options
Diffstat (limited to 'arch/arm/mach-at91/pm.c')
| -rw-r--r-- | arch/arm/mach-at91/pm.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 8ab4feb1ec5b..ec2fe4ca1e27 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c | |||
| @@ -23,16 +23,15 @@ | |||
| 23 | #include <asm/atomic.h> | 23 | #include <asm/atomic.h> |
| 24 | #include <asm/mach/time.h> | 24 | #include <asm/mach/time.h> |
| 25 | #include <asm/mach/irq.h> | 25 | #include <asm/mach/irq.h> |
| 26 | #include <asm/mach-types.h> | ||
| 27 | 26 | ||
| 28 | #include <asm/arch/at91_pmc.h> | 27 | #include <mach/at91_pmc.h> |
| 29 | #include <asm/arch/gpio.h> | 28 | #include <mach/gpio.h> |
| 30 | #include <asm/arch/cpu.h> | 29 | #include <mach/cpu.h> |
| 31 | 30 | ||
| 32 | #include "generic.h" | 31 | #include "generic.h" |
| 33 | 32 | ||
| 34 | #ifdef CONFIG_ARCH_AT91RM9200 | 33 | #ifdef CONFIG_ARCH_AT91RM9200 |
| 35 | #include <asm/arch/at91rm9200_mc.h> | 34 | #include <mach/at91rm9200_mc.h> |
| 36 | 35 | ||
| 37 | /* | 36 | /* |
| 38 | * The AT91RM9200 goes into self-refresh mode with this command, and will | 37 | * The AT91RM9200 goes into self-refresh mode with this command, and will |
| @@ -42,7 +41,7 @@ | |||
| 42 | #define sdram_selfrefresh_disable() do {} while (0) | 41 | #define sdram_selfrefresh_disable() do {} while (0) |
| 43 | 42 | ||
| 44 | #elif defined(CONFIG_ARCH_AT91CAP9) | 43 | #elif defined(CONFIG_ARCH_AT91CAP9) |
| 45 | #include <asm/arch/at91cap9_ddrsdr.h> | 44 | #include <mach/at91cap9_ddrsdr.h> |
| 46 | 45 | ||
| 47 | static u32 saved_lpr; | 46 | static u32 saved_lpr; |
| 48 | 47 | ||
| @@ -59,7 +58,7 @@ static inline void sdram_selfrefresh_enable(void) | |||
| 59 | #define sdram_selfrefresh_disable() at91_sys_write(AT91_DDRSDRC_LPR, saved_lpr) | 58 | #define sdram_selfrefresh_disable() at91_sys_write(AT91_DDRSDRC_LPR, saved_lpr) |
| 60 | 59 | ||
| 61 | #else | 60 | #else |
| 62 | #include <asm/arch/at91sam9_sdramc.h> | 61 | #include <mach/at91sam9_sdramc.h> |
| 63 | 62 | ||
| 64 | #ifdef CONFIG_ARCH_AT91SAM9263 | 63 | #ifdef CONFIG_ARCH_AT91SAM9263 |
| 65 | /* | 64 | /* |
| @@ -92,8 +91,8 @@ static inline void sdram_selfrefresh_enable(void) | |||
| 92 | */ | 91 | */ |
| 93 | #if defined(AT91_SHDWC) | 92 | #if defined(AT91_SHDWC) |
| 94 | 93 | ||
| 95 | #include <asm/arch/at91_rstc.h> | 94 | #include <mach/at91_rstc.h> |
| 96 | #include <asm/arch/at91_shdwc.h> | 95 | #include <mach/at91_shdwc.h> |
| 97 | 96 | ||
| 98 | static void __init show_reset_status(void) | 97 | static void __init show_reset_status(void) |
| 99 | { | 98 | { |
