diff options
author | Marek Vasut <marek.vasut@gmail.com> | 2011-11-26 11:18:57 +0100 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2011-12-06 23:59:33 +0100 |
commit | f68d2a222f0c37e281d28888add34ae263be6777 (patch) | |
tree | ff30917d221b816d2345b19f30b2b221068527af /arch/arm | |
parent | 4438a45f4d6abd4b65998dd76528c4705b93b4b5 (diff) |
PXA: Rename pxa_dram_init to pxa2xx_dram_init
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/cpu/pxa/pxa2xx.c | 4 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-pxa/pxa.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/cpu/pxa/pxa2xx.c b/arch/arm/cpu/pxa/pxa2xx.c index e7b475d162a..09e8177f7b8 100644 --- a/arch/arm/cpu/pxa/pxa2xx.c +++ b/arch/arm/cpu/pxa/pxa2xx.c @@ -71,7 +71,7 @@ inline void writelrb(uint32_t val, uint32_t addr) asm volatile("" : : : "memory"); } -void pxa_dram_init(void) +void pxa2xx_dram_init(void) { uint32_t tmp; int i; @@ -262,7 +262,7 @@ void pxa_wakeup(void) /* Wakeup */ if (rcsr & RCSR_SMR) { writel(PSSR_PH, PSSR); - pxa_dram_init(); + pxa2xx_dram_init(); icache_disable(); dcache_disable(); asm volatile("mov pc, %0" : : "r"(readl(PSPR))); diff --git a/arch/arm/include/asm/arch-pxa/pxa.h b/arch/arm/include/asm/arch-pxa/pxa.h index 050b3cd8d82..49c6552c578 100644 --- a/arch/arm/include/asm/arch-pxa/pxa.h +++ b/arch/arm/include/asm/arch-pxa/pxa.h @@ -24,6 +24,6 @@ int cpu_is_pxa25x(void); int cpu_is_pxa27x(void); -void pxa_dram_init(void); +void pxa2xx_dram_init(void); #endif /* __PXA_H__ */ |