diff options
author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2012-01-24 18:56:05 -0500 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-02-03 07:42:19 -0500 |
commit | c54b7bbbd25600007d452909e6fac39fd36bbc98 (patch) | |
tree | 176c4807f665d5ea6bb696ebb4a252fb7d88250b /arch | |
parent | 9918ceafd4a9e013572e03983f528017c29bb1cb (diff) |
ARM: at91: coding style fixes
This patch is mindless and does only fix the line length.
The purpose is to facilitate the review of the next patches.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-at91/pm.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h index 218d816427c0..caac65f39838 100644 --- a/arch/arm/mach-at91/pm.h +++ b/arch/arm/mach-at91/pm.h | |||
@@ -20,9 +20,12 @@ static inline u32 sdram_selfrefresh_enable(void) | |||
20 | return saved_lpr; | 20 | return saved_lpr; |
21 | } | 21 | } |
22 | 22 | ||
23 | #define sdram_selfrefresh_disable(saved_lpr) at91_sys_write(AT91_SDRAMC_LPR, saved_lpr) | 23 | #define sdram_selfrefresh_disable(saved_lpr) \ |
24 | #define wait_for_interrupt_enable() asm volatile ("mcr p15, 0, %0, c7, c0, 4" \ | 24 | at91_sys_write(AT91_SDRAMC_LPR, saved_lpr) |
25 | : : "r" (0)) | 25 | |
26 | #define wait_for_interrupt_enable() \ | ||
27 | asm volatile ("mcr p15, 0, %0, c7, c0, 4" \ | ||
28 | : : "r" (0)) | ||
26 | 29 | ||
27 | #elif defined(CONFIG_ARCH_AT91SAM9G45) | 30 | #elif defined(CONFIG_ARCH_AT91SAM9G45) |
28 | #include <mach/at91sam9_ddrsdr.h> | 31 | #include <mach/at91sam9_ddrsdr.h> |
@@ -59,6 +62,7 @@ static inline u32 sdram_selfrefresh_enable(void) | |||
59 | at91_ramc_write(0, AT91_DDRSDRC_LPR, saved_lpr0); \ | 62 | at91_ramc_write(0, AT91_DDRSDRC_LPR, saved_lpr0); \ |
60 | at91_ramc_write(1, AT91_DDRSDRC_LPR, saved_lpr1); \ | 63 | at91_ramc_write(1, AT91_DDRSDRC_LPR, saved_lpr1); \ |
61 | } while (0) | 64 | } while (0) |
65 | |||
62 | #define wait_for_interrupt_enable() cpu_do_idle() | 66 | #define wait_for_interrupt_enable() cpu_do_idle() |
63 | 67 | ||
64 | #else | 68 | #else |
@@ -79,11 +83,15 @@ static inline u32 sdram_selfrefresh_enable(void) | |||
79 | saved_lpr = at91_ramc_read(0, AT91_SDRAMC_LPR); | 83 | saved_lpr = at91_ramc_read(0, AT91_SDRAMC_LPR); |
80 | 84 | ||
81 | lpr = saved_lpr & ~AT91_SDRAMC_LPCB; | 85 | lpr = saved_lpr & ~AT91_SDRAMC_LPCB; |
82 | at91_ramc_write(0, AT91_SDRAMC_LPR, lpr | AT91_SDRAMC_LPCB_SELF_REFRESH); | 86 | at91_ramc_write(0, AT91_SDRAMC_LPR, lpr | |
87 | AT91_SDRAMC_LPCB_SELF_REFRESH); | ||
83 | return saved_lpr; | 88 | return saved_lpr; |
84 | } | 89 | } |
85 | 90 | ||
86 | #define sdram_selfrefresh_disable(saved_lpr) at91_ramc_write(0, AT91_SDRAMC_LPR, saved_lpr) | 91 | #define sdram_selfrefresh_disable(saved_lpr) \ |
87 | #define wait_for_interrupt_enable() cpu_do_idle() | 92 | at91_ramc_write(0, AT91_SDRAMC_LPR, saved_lpr) |
93 | |||
94 | #define wait_for_interrupt_enable() \ | ||
95 | cpu_do_idle() | ||
88 | 96 | ||
89 | #endif | 97 | #endif |