From d6498bc4594c8042a2fb221e8876cb8bba4b7105 Mon Sep 17 00:00:00 2001
From: Peng Fan <peng.fan@nxp.com>
Date: Mon, 11 May 2020 15:19:53 +0800
Subject: [PATCH] imx: remove imx sip file

We have switch to use arm_smccc_smc, no need to keep i.MX specific
sip wrapper.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 arch/arm/mach-imx/Makefile |  2 +-
 arch/arm/mach-imx/sip.c    | 48 --------------------------------------
 2 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 arch/arm/mach-imx/sip.c

diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index a70d51b5cf..1aa26a50ad 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -218,7 +218,7 @@ endif
 
 targets += $(addprefix ../../../,SPL spl/u-boot-spl.cfgout u-boot-dtb.cfgout u-boot.cfgout u-boot.uim spl/u-boot-nand-spl.imx)
 
-obj-$(CONFIG_ARM64) += lowlevel.o sip.o
+obj-$(CONFIG_ARM64) += lowlevel.o
 
 obj-$(CONFIG_MX5) += mx5/
 obj-$(CONFIG_MX6) += mx6/
diff --git a/arch/arm/mach-imx/sip.c b/arch/arm/mach-imx/sip.c
deleted file mode 100644
index 6cb8179ee8..0000000000
--- a/arch/arm/mach-imx/sip.c
+++ /dev/null
@@ -1,48 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2017 NXP
- */
-
-#include <common.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/cache.h>
-#include <asm/ptrace.h>
-
-unsigned long call_imx_sip(unsigned long id, unsigned long reg0,
-			   unsigned long reg1, unsigned long reg2,
-			   unsigned long reg3)
-{
-	struct pt_regs regs;
-
-	regs.regs[0] = id;
-	regs.regs[1] = reg0;
-	regs.regs[2] = reg1;
-	regs.regs[3] = reg2;
-	regs.regs[4] = reg3;
-
-	smc_call(&regs);
-
-	return regs.regs[0];
-}
-
-/*
- * Do an SMC call to return 2 registers by having reg1 passed in by reference
- */
-unsigned long call_imx_sip_ret2(unsigned long id, unsigned long reg0,
-				unsigned long *reg1, unsigned long reg2,
-				unsigned long reg3)
-{
-	struct pt_regs regs;
-
-	regs.regs[0] = id;
-	regs.regs[1] = reg0;
-	regs.regs[2] = *reg1;
-	regs.regs[3] = reg2;
-	regs.regs[4] = reg3;
-
-	smc_call(&regs);
-
-	*reg1 = regs.regs[1];
-
-	return regs.regs[0];
-}
-- 
2.39.5