diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2012-02-02 18:55:00 -0800 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-02-13 07:04:59 -0800 |
| commit | 70d7047993252be0014593f6b7dfc5c2f31e6b52 (patch) | |
| tree | 9e1193937b8c97acb14e441200cb7988a8847155 /arch/arm/mach-tegra/common.c | |
| parent | 2b4ee6d7eae39d7805a30fbfcfdeaeb0e32cc719 (diff) | |
ARM: tegra: Clean up CACHE_L2X0 conditionals and includes
Change-Id: I9862e73f264c757f97aaad03f3373fb1d3e95462
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-on: http://git-master/r/79138
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/common.c')
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index cfae2bc1c12e..ae18a18623f9 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -195,7 +195,8 @@ static __initdata struct tegra_clk_init_table common_clk_init_table[] = { { NULL, NULL, 0, 0}, }; -#if defined(CONFIG_TRUSTED_FOUNDATIONS) && defined(CONFIG_CACHE_L2X0) +#ifdef CONFIG_CACHE_L2X0 +#ifdef CONFIG_TRUSTED_FOUNDATIONS static void tegra_cache_smc(bool enable, u32 arg) { void __iomem *p = IO_ADDRESS(TEGRA_ARM_PERIF_BASE) + 0x3000; @@ -264,11 +265,10 @@ static void tegra_l2x0_disable(void) tegra_cache_smc(false, l2x0_way_mask); local_irq_restore(flags); } -#endif /* CONFIG_TRUSTED_FOUNDATIONS && defined(CONFIG_CACHE_L2X0) */ +#endif /* CONFIG_TRUSTED_FOUNDATIONS */ void tegra_init_cache(bool init) { -#ifdef CONFIG_CACHE_L2X0 void __iomem *p = IO_ADDRESS(TEGRA_ARM_PERIF_BASE) + 0x3000; u32 aux_ctrl; u32 speedo; @@ -329,8 +329,8 @@ void tegra_init_cache(bool init) } l2x0_enable(); #endif -#endif } +#endif static void __init tegra_init_power(void) { |