imx8m: soc: use arm_smccc_smc
authorPeng Fan <peng.fan@nxp.com>
Mon, 11 May 2020 07:14:04 +0000 (15:14 +0800)
committerPeng Fan <peng.fan@nxp.com>
Tue, 14 Jul 2020 07:23:46 +0000 (15:23 +0800)
Use arm_smccc_smc to replace call_imx_sip

Signed-off-by: Peng Fan <peng.fan@nxp.com>
arch/arm/mach-imx/imx8m/soc.c

index 1d2c8e6..fae69be 100644 (file)
@@ -22,6 +22,7 @@
 #include <fdt_support.h>
 #include <fsl_wdog.h>
 #include <imx_sip.h>
+#include <linux/arm-smccc.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -432,10 +433,12 @@ void reset_cpu(ulong addr)
 static void acquire_buildinfo(void)
 {
        u64 atf_commit = 0;
+       struct arm_smccc_res res;
 
        /* Get ARM Trusted Firmware commit id */
-       atf_commit = call_imx_sip(IMX_SIP_BUILDINFO,
-                                 IMX_SIP_BUILDINFO_GET_COMMITHASH, 0, 0, 0);
+       arm_smccc_smc(IMX_SIP_BUILDINFO, IMX_SIP_BUILDINFO_GET_COMMITHASH,
+                     0, 0 , 0, 0, 0, 0, &res);
+       atf_commit = res.a0;
        if (atf_commit == 0xffffffff) {
                debug("ATF does not support build info\n");
                atf_commit = 0x30; /* Display 0, 0 ascii is 0x30 */