From a8d700c478231041ae9f495d64af0e044f96cd57 Mon Sep 17 00:00:00 2001
From: qjb <qjb@rock-chips.com>
Date: Fri, 9 Jan 2015 10:00:04 +0800
Subject: [PATCH] Revert "TrustZone: Add Support Trust OS"

This reverts commit 940a3100bdd90dc3de257c2e185e370374fb20e8.
---
 arch/arm/mach-rockchip/Kconfig     |  4 ++--
 arch/arm/mach-rockchip/Makefile    |  2 +-
 arch/arm/mach-rockchip/pm-rk312x.c |  2 --
 arch/arm/mach-rockchip/rk3288.c    | 10 +---------
 arch/arm/mm/Kconfig                | 10 ----------
 5 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index c5d853b61e5b..24b25bc5cf95 100755
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -20,8 +20,8 @@ config ARCH_ROCKCHIP
 	select DMADEVICES
 	select PL330_DMA
 	select FIQ_GLUE
-	select ARM_ERRATA_818325 if !ARM_TRUSTZONE
-	select ARM_ERRATA_821420 if !ARM_TRUSTZONE
+	select ARM_ERRATA_818325
+	select ARM_ERRATA_821420
 
 if ARCH_ROCKCHIP
 
diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile
index 561cb6f9425c..4bfe9f1fd009 100755
--- a/arch/arm/mach-rockchip/Makefile
+++ b/arch/arm/mach-rockchip/Makefile
@@ -5,7 +5,7 @@ obj-y += rk312x.o
 obj-y += rk3126b.o
 obj-y += rk3188.o
 obj-y += rk3288.o
-obj-$(!CONFIG_ARM_TRUSTZONE) += ddr_freq.o
+obj-y += ddr_freq.o
 obj-y += efuse.o
 obj-y += pvtm.o
 obj-y += rk_system_status.o
diff --git a/arch/arm/mach-rockchip/pm-rk312x.c b/arch/arm/mach-rockchip/pm-rk312x.c
index 475f6d0e2b0c..ba10025ba823 100644
--- a/arch/arm/mach-rockchip/pm-rk312x.c
+++ b/arch/arm/mach-rockchip/pm-rk312x.c
@@ -841,9 +841,7 @@ void fiq_glue_resume(void);
 static inline void  rkpm_peri_resume(u32 power_mode)
 {
 	rkpm_gic_dist_resume(&slp_gic_save[0]);
-#ifndef CONFIG_ARM_TRUSTZONE
 	fiq_glue_resume();
-#endif
 }
 
 static void rkpm_save_setting_resume(void)
diff --git a/arch/arm/mach-rockchip/rk3288.c b/arch/arm/mach-rockchip/rk3288.c
index de229db2a63a..d44709321c62 100755
--- a/arch/arm/mach-rockchip/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288.c
@@ -146,9 +146,7 @@ static void __init rk3288_dt_map_io(void)
 	writel_relaxed(0x00010001, RK_GRF_VIRT + RK3288_GRF_SOC_CON2);
 
 	/* disable address remap */
-#ifndef CONFIG_ARM_TRUSTZONE
 	writel_relaxed(0x08000000, RK_SGRF_VIRT + RK3288_SGRF_SOC_CON0);
-#endif
 
 	/* enable timer7 for core */
 	writel_relaxed(0, RK3288_TIMER7_VIRT + 0x10);
@@ -164,9 +162,7 @@ static void __init rk3288_dt_map_io(void)
 	writel_relaxed(24, RK_PMU_VIRT + RK3288_PMU_GPU_PWRUP_CNT);
 
 	rk3288_boot_mode_init();
-#ifndef CONFIG_ARM_TRUSTZONE
 	rockchip_efuse_init();
-#endif
 }
 
 static const u8 pmu_st_map[] = {
@@ -671,11 +667,7 @@ static int  __init rk3288_pm_dbg(void)
 
 static int __init rk3288_ddr_init(void)
 {
-    if (cpu_is_rk3288()
-#ifdef CONFIG_ARM_TRUSTZONE
-	&& false
-#endif
-	)
+    if (cpu_is_rk3288())
     {
 	ddr_change_freq = _ddr_change_freq;
 	ddr_round_rate = _ddr_round_rate;
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index af54f6daba1d..36e9f24e03b0 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -596,16 +596,6 @@ config IO_36
 
 comment "Processor Features"
 
-config ARM_TRUSTZONE
-	bool "Support TrustZone-enabled Trusted Execution Environment"
-	default n
-	help
-	  Select if you want a kernel to be executed at non-secure world.
-	  This option should be used with related secure bootloader and
-	  TrustZone software.
-
-	  If you don't know about TrustZone, say 'N'.
-
 config ARM_LPAE
 	bool "Support for the Large Physical Address Extension"
 	depends on MMU && CPU_32v7 && !CPU_32v6 && !CPU_32v5 && \
-- 
2.34.1