diff options
author | Varun Wadekar <vwadekar@nvidia.com> | 2013-04-08 15:17:29 +0530 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:08:07 -0700 |
commit | ce783e1f977db7459eb9e333aa83effbb5805951 (patch) | |
tree | d09098ad97c915fdd4f24e8850d748ce41ad6581 /arch | |
parent | 386a98a1b2aaafe24c08667e236fe87893576f30 (diff) |
ARM: Tegra: issue smc to wakeup secure world only for TF's OS
Change-Id: I7a0031e70d3be1f1950633888aa3ad24a5ddcced
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/217283
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-tegra/headsmp.S | 4 | ||||
-rw-r--r-- | arch/arm/mach-tegra/pm.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/headsmp.S b/arch/arm/mach-tegra/headsmp.S index 06091dd214f2..473cc1f6fcc1 100644 --- a/arch/arm/mach-tegra/headsmp.S +++ b/arch/arm/mach-tegra/headsmp.S @@ -115,7 +115,7 @@ ENTRY(tegra_resume) str r1, [r0] #endif /* CONFIG_HAVE_ARM_SCU */ -#ifdef CONFIG_TEGRA_USE_SECURE_KERNEL +#ifdef CONFIG_TRUSTED_FOUNDATIONS #ifndef CONFIG_ARCH_TEGRA_11x_SOC mov32 r1, TEGRA_TMRUS_BASE ldr r0, [r1] @@ -131,7 +131,7 @@ ENTRY(tegra_resume) adr r1, tegra_resume_smc_exit_time str r0, [r1] #endif /* !CONFIG_ARCH_TEGRA_11x_SOC */ -#endif /* CONFIG_TEGRA_USE_SECURE_KERNEL */ +#endif /* CONFIG_TRUSTED_FOUNDATIONS */ #ifdef CONFIG_CACHE_L2X0 #if !defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \ diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c index 09a1d267ae3f..155093c91bc4 100644 --- a/arch/arm/mach-tegra/pm.c +++ b/arch/arm/mach-tegra/pm.c @@ -717,7 +717,7 @@ unsigned int tegra_idle_power_down_last(unsigned int sleep_time, tegra_init_cache(false); #endif -#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) +#if defined(CONFIG_TRUSTED_FOUNDATIONS) #ifndef CONFIG_ARCH_TEGRA_11x_SOC trace_smc_wake(tegra_resume_smc_entry_time, NVSEC_SMC_START); trace_smc_wake(tegra_resume_smc_exit_time, NVSEC_SMC_DONE); |