imx: bootaux: use arm_smccc_smc

Use arm_smccc_smc to replace call_imx_sip

Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c
index 868633cf8a47d51ee9e8855e8f9d98a5b7833862..e1fc4b3e19af8cdc632d4f10d6cb9a1833decae8 100644 (file)
--- a/arch/arm/mach-imx/imx_bootaux.c
+++ b/arch/arm/mach-imx/imx_bootaux.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <elf.h>
 #include <imx_sip.h>
+#include <linux/arm-smccc.h>
 #include <linux/compiler.h>
 #include <cpu_func.h>
 
@@ -55,7 +56,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);
@@ -67,7 +69,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;