ARM: OMAP: Fix SRAM compile for omap1

Recent SRAM rearranging broke omap1 compile, this fixes it.

After 2.6.25 we should move plat-omap/sram-fn.S to
mach-omap1/sram.S.

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/plat-omap/sram-fn.S b/arch/arm/plat-omap/sram-fn.S
index 9e1813c77e05bf4ad44c1a347432f92fea3c5e5a..126d252062d758d1b199102c3d2dd5534c89b33b 100644 (file)
--- a/arch/arm/plat-omap/sram-fn.S
+++ b/arch/arm/plat-omap/sram-fn.S
@@ -18,7 +18,7 @@
 /*
  * Reprograms ULPD and CKCTL.
  */
-ENTRY(sram_reprogram_clock)
+ENTRY(omap1_sram_reprogram_clock)
        stmfd   sp!, {r0 - r12, lr}             @ save registers on stack
 
        mov     r2, #IO_ADDRESS(DPLL_CTL) & 0xff000000
@@ -53,5 +53,5 @@ lock: ldrh    r4, [r2], #0                    @ read back dpll value
 
 out:
        ldmfd   sp!, {r0 - r12, pc}             @ restore regs and return
-ENTRY(sram_reprogram_clock_sz)
-       .word   . - sram_reprogram_clock
+ENTRY(omap1_sram_reprogram_clock_sz)
+       .word   . - omap1_sram_reprogram_clock

diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index 1186d2bc8b4152526e04df127084d1198d5b45e9..2fc8f617c29c3743a7d14c31b75d5c25e9c04f47 100644 (file)
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -338,8 +338,9 @@ void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl)
 
 int __init omap1_sram_init(void)
 {
-       _omap_sram_reprogram_clock = omap_sram_push(sram_reprogram_clock,
-                                                   sram_reprogram_clock_sz);
+       _omap_sram_reprogram_clock =
+                       omap_sram_push(omap1_sram_reprogram_clock,
+                                       omap1_sram_reprogram_clock_sz);
 
        return 0;
 }

diff --git a/include/asm-arm/arch-omap/sram.h b/include/asm-arm/arch-omap/sram.h
index 2b7f10338ef30c4ff4d71429e89d497772e77062..c55df46bb418180e10f091eb39215829b47fbfd1 100644 (file)
--- a/include/asm-arm/arch-omap/sram.h
+++ b/include/asm-arm/arch-omap/sram.h
@@ -24,6 +24,9 @@ extern void omap2_sram_reprogram_sdrc(u32 perf_level, u32 dll_val,
 extern u32 omap2_set_prcm(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass);
 
 /* Do not use these */
+extern void omap1_sram_reprogram_clock(u32 ckctl, u32 dpllctl);
+extern unsigned long omap1_sram_reprogram_clock_sz;
+
 extern void omap24xx_sram_reprogram_clock(u32 ckctl, u32 dpllctl);
 extern unsigned long omap24xx_sram_reprogram_clock_sz;