diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-07 15:20:21 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-07 15:20:21 -0800 |
| commit | 0180a7d012e413a956e3f46fcbeb8dbf3374a19c (patch) | |
| tree | 4fe9fb3d4410085ed4fc0203da9db25d026844a1 /arch/arm/mach-at91/pm.h | |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
| parent | 948ce6a6a667485e221e92af4a564839af3ba6c5 (diff) | |
Merge branch 'at91-3.4-base+device_board' of git://github.com/at91linux/linux-at91 into next/drivers
* 'at91-3.4-base+device_board' of git://github.com/at91linux/linux-at91:
ARM: at91: Add external RTC for Flexibity board
ARM: at91: add Atmel ISI and ov2640 support on sam9m10g45 board
ARM: at91: add clock selection parameter for at91_add_device_isi()
ARM: at91: Update struct atmel_nand_data to support PMECC
ARM: at91/dma: DMA controller registering with DT support
ARM: at91/dma: remove platform data from DMA controller
ARM: at91: code removal of CAP9 SoC
Conflicts:
arch/arm/mach-at91/at91cap9.c
Diffstat (limited to 'arch/arm/mach-at91/pm.h')
| -rw-r--r-- | arch/arm/mach-at91/pm.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h index 7eb40d24242..218d816427c 100644 --- a/arch/arm/mach-at91/pm.h +++ b/arch/arm/mach-at91/pm.h @@ -24,24 +24,6 @@ static inline u32 sdram_selfrefresh_enable(void) #define wait_for_interrupt_enable() asm volatile ("mcr p15, 0, %0, c7, c0, 4" \ : : "r" (0)) -#elif defined(CONFIG_ARCH_AT91CAP9) -#include <mach/at91sam9_ddrsdr.h> - - -static inline u32 sdram_selfrefresh_enable(void) -{ - u32 saved_lpr, lpr; - - saved_lpr = at91_ramc_read(0, AT91CAP9_DDRSDRC_LPR); - - lpr = saved_lpr & ~AT91_DDRSDRC_LPCB; - at91_ramc_write(0, AT91CAP9_DDRSDRC_LPR, lpr | AT91_DDRSDRC_LPCB_SELF_REFRESH); - return saved_lpr; -} - -#define sdram_selfrefresh_disable(saved_lpr) at91_ramc_write(0, AT91CAP9_DDRSDRC_LPR, saved_lpr) -#define wait_for_interrupt_enable() cpu_do_idle() - #elif defined(CONFIG_ARCH_AT91SAM9G45) #include <mach/at91sam9_ddrsdr.h> |