Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / arch / arm / plat-omap / sram.c

diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index 8b28664..0b8c4d5 100644 (file)
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -316,13 +316,13 @@ static inline int omap243x_sram_init(void)
 #ifdef CONFIG_ARCH_OMAP3
 
 static u32 (*_omap3_sram_configure_core_dpll)(
-                       u32 m2, u32 unlock_dll, u32 f, u32 inc,
+                       u32 cm_clksel1_pll, u32 unlock_dll, u32 f, u32 inc,
                        u32 sdrc_rfr_ctrl_0, u32 sdrc_actim_ctrl_a_0,
                        u32 sdrc_actim_ctrl_b_0, u32 sdrc_mr_0,
                        u32 sdrc_rfr_ctrl_1, u32 sdrc_actim_ctrl_a_1,
                        u32 sdrc_actim_ctrl_b_1, u32 sdrc_mr_1);
 
-u32 omap3_configure_core_dpll(u32 m2, u32 unlock_dll, u32 f, u32 inc,
+u32 omap3_configure_core_dpll(u32 cm_clksel1_pll, u32 unlock_dll, u32 f, u32 inc,
                        u32 sdrc_rfr_ctrl_0, u32 sdrc_actim_ctrl_a_0,
                        u32 sdrc_actim_ctrl_b_0, u32 sdrc_mr_0,
                        u32 sdrc_rfr_ctrl_1, u32 sdrc_actim_ctrl_a_1,
@@ -330,14 +330,13 @@ u32 omap3_configure_core_dpll(u32 m2, u32 unlock_dll, u32 f, u32 inc,
 {
        BUG_ON(!_omap3_sram_configure_core_dpll);
        return _omap3_sram_configure_core_dpll(
-                       m2, unlock_dll, f, inc,
+                       cm_clksel1_pll, unlock_dll, f, inc,
                        sdrc_rfr_ctrl_0, sdrc_actim_ctrl_a_0,
                        sdrc_actim_ctrl_b_0, sdrc_mr_0,
                        sdrc_rfr_ctrl_1, sdrc_actim_ctrl_a_1,
                        sdrc_actim_ctrl_b_1, sdrc_mr_1);
 }
 
-#ifdef CONFIG_PM
 void omap3_sram_restore_context(void)
 {
        omap_sram_ceil = omap_sram_base + omap_sram_size;
@@ -347,17 +346,18 @@ void omap3_sram_restore_context(void)
                               omap3_sram_configure_core_dpll_sz);
        omap_push_sram_idle();
 }
-#endif /* CONFIG_PM */
-
-#endif /* CONFIG_ARCH_OMAP3 */
 
 static inline int omap34xx_sram_init(void)
 {
-#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)
        omap3_sram_restore_context();
-#endif
        return 0;
 }
+#else
+static inline int omap34xx_sram_init(void)
+{
+       return 0;
+}
+#endif /* CONFIG_ARCH_OMAP3 */
 
 int __init omap_sram_init(void)
 {