Skip to content

Commit

Permalink
ARM: at91: coding style fixes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Daniel Lezcano authored and Nicolas Ferre committed Feb 3, 2012
1 parent 9918cea commit c54b7bb
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions arch/arm/mach-at91/pm.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@ static inline u32 sdram_selfrefresh_enable(void)
return saved_lpr;
}

#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))
#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>
Expand Down Expand Up @@ -59,6 +62,7 @@ static inline u32 sdram_selfrefresh_enable(void)
at91_ramc_write(0, AT91_DDRSDRC_LPR, saved_lpr0); \
at91_ramc_write(1, AT91_DDRSDRC_LPR, saved_lpr1); \
} while (0)

#define wait_for_interrupt_enable() cpu_do_idle()

#else
Expand All @@ -79,11 +83,15 @@ static inline u32 sdram_selfrefresh_enable(void)
saved_lpr = at91_ramc_read(0, AT91_SDRAMC_LPR);

lpr = saved_lpr & ~AT91_SDRAMC_LPCB;
at91_ramc_write(0, AT91_SDRAMC_LPR, lpr | AT91_SDRAMC_LPCB_SELF_REFRESH);
at91_ramc_write(0, AT91_SDRAMC_LPR, lpr |
AT91_SDRAMC_LPCB_SELF_REFRESH);
return saved_lpr;
}

#define sdram_selfrefresh_disable(saved_lpr) at91_ramc_write(0, AT91_SDRAMC_LPR, saved_lpr)
#define wait_for_interrupt_enable() cpu_do_idle()
#define sdram_selfrefresh_disable(saved_lpr) \
at91_ramc_write(0, AT91_SDRAMC_LPR, saved_lpr)

#define wait_for_interrupt_enable() \
cpu_do_idle()

#endif

0 comments on commit c54b7bb

Please sign in to comment.