From: chenjh <chenjh@rock-chips.com>
Date: Fri, 17 Mar 2017 09:10:43 +0000 (+0800)
Subject: firmware: psci: remove fiq enable after cpu_suspend
X-Git-Tag: firefly_0821_release~118
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fdfa7d9d572f05a6ec6c1696662c7301ec63129d;p=firefly-linux-kernel-4.4.55.git

firmware: psci: remove fiq enable after cpu_suspend

Change-Id: I2fb6cd70ed462eb5abc36be790008daa134810d6
Signed-off-by: chenjh <chenjh@rock-chips.com>
---

diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index 6da0c018afd9..28395eb9e05e 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -34,10 +34,6 @@
 #include <asm/smp_plat.h>
 #include <asm/suspend.h>
 
-#ifdef CONFIG_FIQ_DEBUGGER_EL3_TO_EL1
-#include <linux/rockchip/rockchip_sip.h>
-#endif
-
 /*
  * While a 64-bit OS can make calls with SMC32 calling conventions, for some
  * calls it is necessary to use SMC64 to pass or return 64-bit values.
@@ -355,9 +351,6 @@ int psci_cpu_suspend_enter(unsigned long index)
 	else
 		ret = cpu_suspend(index, psci_suspend_finisher);
 
-#ifdef CONFIG_FIQ_DEBUGGER_EL3_TO_EL1
-	psci_enable_fiq();
-#endif
 	return ret;
 }