ARM: cache-l2x0: Save L2CC registers using pl310 save/resume
Renamed the l2x0_suspend and resume functions to l2cc suspend
and resume. Functions pl310 save/resume takes care of the L2CC
registers. Moving the functions outside CONFIG_OF so that
those could be directly used.
Change-Id: I07a156de37ee0504debbbd392bc017ebfa9cae1e
Signed-off-by: Taniya Das <tdas@codeaurora.org>
diff --git a/arch/arm/mach-msm/pm-8x60.c b/arch/arm/mach-msm/pm-8x60.c
index b0fbebb..6de0660 100644
--- a/arch/arm/mach-msm/pm-8x60.c
+++ b/arch/arm/mach-msm/pm-8x60.c
@@ -635,9 +635,9 @@
{
bool collapsed = 0;
- l2x0_suspend();
+ l2cc_suspend();
collapsed = msm_pm_collapse();
- l2x0_resume(collapsed);
+ l2cc_resume(collapsed);
return collapsed;
}
diff --git a/arch/arm/mach-msm/pm2.c b/arch/arm/mach-msm/pm2.c
index 4f3c7e4..4518d7c 100644
--- a/arch/arm/mach-msm/pm2.c
+++ b/arch/arm/mach-msm/pm2.c
@@ -1192,7 +1192,7 @@
#endif
#ifdef CONFIG_CACHE_L2X0
- l2x0_suspend();
+ l2cc_suspend();
#endif
collapsed = msm_pm_collapse();
@@ -1217,7 +1217,7 @@
}
#ifdef CONFIG_CACHE_L2X0
- l2x0_resume(collapsed);
+ l2cc_resume(collapsed);
#endif
msm_pm_boot_config_after_pc(smp_processor_id());
@@ -1434,14 +1434,14 @@
#ifdef CONFIG_CACHE_L2X0
if (!cpu_is_msm8625())
- l2x0_suspend();
+ l2cc_suspend();
#endif
collapsed = msm_pm_collapse();
#ifdef CONFIG_CACHE_L2X0
if (!cpu_is_msm8625())
- l2x0_resume(collapsed);
+ l2cc_resume(collapsed);
#endif
msm_pm_boot_config_after_pc(smp_processor_id());