ARM: OMAP: Introduce common omap_map_sram() and omap_sram_reset()

This will allow us to separate out omap1 and omap2+ specific
code in the later patches.

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

diff --git a/arch/arm/plat-omap/include/plat/sram.h b/arch/arm/plat-omap/include/plat/sram.h
index c60025a45ee16d6a592f1fd24035b80ff8d97d95..ba4525059a996d44f9ce8ddb83ae0bba6802fc79 100644 (file)
--- a/arch/arm/plat-omap/include/plat/sram.h
+++ b/arch/arm/plat-omap/include/plat/sram.h
@@ -1,5 +1,9 @@
 int omap_sram_init(void);
 
+void omap_map_sram(unsigned long start, unsigned long size,
+                       unsigned long skip, int cached);
+void omap_sram_reset(void);
+
 extern void *omap_sram_push_address(unsigned long size);
 
 /* Macro to push a function to the internal SRAM, using the fncpy API */

diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index 337292935256204c6c7f4dc345f574fad48ca962..aa2644a1ca836211c8e0c903944743ad597c43c2 100644 (file)
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -170,13 +170,10 @@ static void __init omap_detect_sram(void)
 /*
  * Note that we cannot use ioremap for SRAM, as clock init needs SRAM early.
  */
-static void __init omap_map_sram(void)
+static void __init omap_fix_and_map_sram(void)
 {
        int cached = 1;
 
-       if (omap_sram_size == 0)
-               return;
-
 #ifdef CONFIG_OMAP4_ERRATA_I688
        if (cpu_is_omap44xx()) {
                omap_sram_start += PAGE_SIZE;
@@ -194,22 +191,8 @@ static void __init omap_map_sram(void)
                cached = 0;
        }
 
-       omap_sram_start = ROUND_DOWN(omap_sram_start, PAGE_SIZE);
-       omap_sram_base = __arm_ioremap_exec(omap_sram_start, omap_sram_size,
-                                               cached);
-       if (!omap_sram_base) {
-               pr_err("SRAM: Could not map\n");
-               return;
-       }
-
-       omap_sram_ceil = omap_sram_base + omap_sram_size;
-
-       /*
-        * Looks like we need to preserve some bootloader code at the
-        * beginning of SRAM for jumping to flash for reboot to work...
-        */
-       memset_io(omap_sram_base + omap_sram_skip, 0,
-                 omap_sram_size - omap_sram_skip);
+       omap_map_sram(omap_sram_start, omap_sram_size,
+                       omap_sram_skip, cached);
 }
 
 /*
@@ -237,6 +220,43 @@ void *omap_sram_push_address(unsigned long size)
        return (void *)omap_sram_ceil;
 }
 
+/*
+ * The SRAM context is lost during off-idle and stack
+ * needs to be reset.
+ */
+void omap_sram_reset(void)
+{
+       omap_sram_ceil = omap_sram_base + omap_sram_size;
+}
+
+/*
+ * Note that we cannot use ioremap for SRAM, as clock init needs SRAM early.
+ */
+void __init omap_map_sram(unsigned long start, unsigned long size,
+                                unsigned long skip, int cached)
+{
+       if (size == 0)
+               return;
+
+       start = ROUND_DOWN(start, PAGE_SIZE);
+       omap_sram_size = size;
+       omap_sram_skip = skip;
+       omap_sram_base = __arm_ioremap_exec(start, size, cached);
+       if (!omap_sram_base) {
+               pr_err("SRAM: Could not map\n");
+               return;
+       }
+
+       omap_sram_reset();
+
+       /*
+        * Looks like we need to preserve some bootloader code at the
+        * beginning of SRAM for jumping to flash for reboot to work...
+        */
+       memset_io(omap_sram_base + omap_sram_skip, 0,
+                 omap_sram_size - omap_sram_skip);
+}
+
 #ifdef CONFIG_ARCH_OMAP1
 
 static void (*_omap_sram_reprogram_clock)(u32 dpllctl, u32 ckctl);
@@ -362,7 +382,7 @@ u32 omap3_configure_core_dpll(u32 m2, u32 unlock_dll, u32 f, u32 inc,
 
 void omap3_sram_restore_context(void)
 {
-       omap_sram_ceil = omap_sram_base + omap_sram_size;
+       omap_sram_reset();
 
        _omap3_sram_configure_core_dpll =
                omap_sram_push(omap3_sram_configure_core_dpll,
@@ -390,7 +410,7 @@ static inline int am33xx_sram_init(void)
 int __init omap_sram_init(void)
 {
        omap_detect_sram();
-       omap_map_sram();
+       omap_fix_and_map_sram();
 
        if (!(cpu_class_is_omap2()))
                omap1_sram_init();