arm: pxa: config option for PXA270 turbo mode

[karo-tx-uboot.git] / arch / arm / cpu / pxa / pxa2xx.c

diff --git a/arch/arm/cpu/pxa/pxa2xx.c b/arch/arm/cpu/pxa/pxa2xx.c
index e7b475d162ac67e1640dd10aa8202c0cac78327a..f07dc67823faebc4a49908d08715f5b829d763be 100644 (file)
--- 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;
@@ -244,7 +244,7 @@ void pxa_clock_setup(void)
 {
        writel(CONFIG_SYS_CKEN, CKEN);
        writel(CONFIG_SYS_CCCR, CCCR);
-       asm volatile("mcr       p14, 0, %0, c6, c0, 0" : : "r"(2));
+       asm volatile("mcr       p14, 0, %0, c6, c0, 0" : : "r"(0x0b));
 
        /* enable the 32Khz oscillator for RTC and PowerManager */
        writel(OSCC_OON, OSCC);
@@ -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)));
@@ -284,7 +284,7 @@ void i2c_clk_enable(void)
        writel(readl(CKEN) | CKEN14_I2C, CKEN);
 }
 
-void reset_cpu(ulong ignored) __attribute__((noreturn));
+void __attribute__((weak)) reset_cpu(ulong ignored) __attribute__((noreturn));
 
 void reset_cpu(ulong ignored)
 {