Use arm_smccc_smc to replace call_imx_sip

Signed-off-by: Peng Fan <[email protected]>
---
 arch/arm/mach-imx/imx_bootaux.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c
index ec0da1164f..908125fff7 100644
--- a/arch/arm/mach-imx/imx_bootaux.c
+++ b/arch/arm/mach-imx/imx_bootaux.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <elf.h>
 #include <imx_sip.h>
+#include <linux/arm-smccc.h>
 #include <linux/compiler.h>
 #include <cpu_func.h>
 
@@ -54,7 +55,8 @@ int arch_auxiliary_core_up(u32 core_id, ulong addr)
 
        /* Enable M4 */
 #ifdef CONFIG_IMX8M
-       call_imx_sip(IMX_SIP_SRC, IMX_SIP_SRC_M4_START, 0, 0, 0);
+       arm_smccc_smc(IMX_SIP_SRC, IMX_SIP_SRC_M4_START, 0, 0,
+                     0, 0, 0, 0, NULL);
 #else
        clrsetbits_le32(SRC_BASE_ADDR + SRC_M4_REG_OFFSET,
                        SRC_M4C_NON_SCLR_RST_MASK, SRC_M4_ENABLE_MASK);
@@ -66,7 +68,12 @@ int arch_auxiliary_core_up(u32 core_id, ulong addr)
 int arch_auxiliary_core_check_up(u32 core_id)
 {
 #ifdef CONFIG_IMX8M
-       return call_imx_sip(IMX_SIP_SRC, IMX_SIP_SRC_M4_STARTED, 0, 0, 0);
+       struct arm_smccc_res res;
+
+       arm_smccc_smc(IMX_SIP_SRC, IMX_SIP_SRC_M4_STARTED, 0, 0,
+                     0, 0, 0, 0, &res);
+
+       return res.a0;
 #else
        unsigned int val;
 
-- 
2.16.4

Reply via email to