ARM: cache-l2x0: Save L2CC registers using pl310 save/resume
This reverts commit a022290fe5165ffe4973355cb76556ce8c629d70.
Save the contents of the L2CC registers in l2x0_init itself as
they are not modified later.
CRs-Fixed: 356696
Change-Id: I05ec3bcce8d1e2f941a9ecbaae8c6598f52831c5
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 60e64cd..cc17ceb 100644
--- a/arch/arm/mach-msm/pm-8x60.c
+++ b/arch/arm/mach-msm/pm-8x60.c
@@ -639,9 +639,9 @@
{
bool collapsed = 0;
- l2x0_suspend();
+ l2cc_suspend();
collapsed = msm_pm_collapse();
- l2x0_resume(collapsed);
+ l2cc_resume();
return collapsed;
}
diff --git a/arch/arm/mach-msm/pm2.c b/arch/arm/mach-msm/pm2.c
index 5726972..6a02609 100644
--- a/arch/arm/mach-msm/pm2.c
+++ b/arch/arm/mach-msm/pm2.c
@@ -1194,7 +1194,7 @@
#endif
#ifdef CONFIG_CACHE_L2X0
- l2x0_suspend();
+ l2cc_suspend();
#endif
collapsed = msm_pm_collapse();
@@ -1219,7 +1219,7 @@
}
#ifdef CONFIG_CACHE_L2X0
- l2x0_resume(collapsed);
+ l2cc_resume();
#endif
msm_pm_boot_config_after_pc(smp_processor_id());
@@ -1436,14 +1436,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();
#endif
msm_pm_boot_config_after_pc(smp_processor_id());