diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2014-03-05 12:27:14 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2014-03-14 05:24:31 -0700 |
| commit | a758c25e6e3840ee07e9e0ee5e1e3ef40210da29 (patch) | |
| tree | 82efbc293ff91c3d146596b3fbff4634ad1b06c8 /drivers/clocksource | |
| parent | 271d8ae75f6a85fefd8ab5297d58d97c6973274f (diff) | |
clocksource: tegra: remove CONFIG_TEGRA_USE_SECURE_KERNEL
Instead, use tegra_cpu_is_secure() to find out if we have a secure
firmware on the device.
Bug 1475528
Change-Id: I60d168e3302dbfeb79932af0f6eac83bda7b2baa
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/377617
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/tegra-tsc-timer.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/clocksource/tegra-tsc-timer.c b/drivers/clocksource/tegra-tsc-timer.c index 764e8b453ed4..b9524d8722f8 100644 --- a/drivers/clocksource/tegra-tsc-timer.c +++ b/drivers/clocksource/tegra-tsc-timer.c @@ -6,7 +6,7 @@ * Author: * Colin Cross <ccross@google.com> * - * Copyright (C) 2013 NVIDIA CORPORATION. All rights reserved. + * Copyright (C) 2013-2014, NVIDIA CORPORATION. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -39,7 +39,7 @@ #include <asm/delay.h> #include "../../arch/arm/mach-tegra/clock.h" - +#include "../../arch/arm/mach-tegra/common.h" static u32 arch_timer_us_mult, arch_timer_us_shift; @@ -134,9 +134,9 @@ void __init tegra_cpu_timer_init(void) static void tegra_arch_timer_per_cpu_init(void) { -#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) - return; -#else + if (tegra_cpu_is_secure()) + return; + if (arch_timer_initialized) { u32 tsc_ref_freq = tegra_clk_measure_input_freq(); @@ -151,7 +151,6 @@ static void tegra_arch_timer_per_cpu_init(void) NOTE: this is a write once (per CPU reset) register. */ __asm__("mcr p15, 0, %0, c14, c0, 0\n" : : "r" (tsc_ref_freq)); } -#endif } static int arch_timer_cpu_notify(struct notifier_block *self, |