uniphier: psci: save context id in cpu_on command

Replace the psci_save_target_pc call by the new function
psci_save(cpu, pc,context_id)

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/mach-uniphier/arm32/psci.c b/arch/arm/mach-uniphier/arm32/psci.c
index 92ec7a94568576ba7552c3547d12e7062a97f171..3f67edf26eb2e2e1f3346777cac71944864f4ced 100644 (file)
--- a/arch/arm/mach-uniphier/arm32/psci.c
+++ b/arch/arm/mach-uniphier/arm32/psci.c
@@ -130,7 +130,8 @@ void psci_arch_init(void)
 
 u32 uniphier_psci_holding_pen_release __secure_data = 0xffffffff;
 
-int __secure psci_cpu_on(u32 function_id, u32 cpuid, u32 entry_point)
+int __secure psci_cpu_on(u32 function_id, u32 cpuid, u32 entry_point,
+                        u32 context_id)
 {
        u32 cpu = cpuid & 0xff;
 
@@ -138,9 +139,11 @@ int __secure psci_cpu_on(u32 function_id, u32 cpuid, u32 entry_point)
        debug_puth(cpuid);
        debug_puts(", entry_point=");
        debug_puth(entry_point);
+       debug_puts(", context_id=");
+       debug_puth(context_id);
        debug_puts("\n");
 
-       psci_save_target_pc(cpu, entry_point);
+       psci_save(cpu, entry_point, context_id);
 
        /* We assume D-cache is off, so do not call flush_dcache() here */
        uniphier_psci_holding_pen_release = cpu;