diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2014-02-16 23:52:46 -0800 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2014-02-17 20:22:23 -0800 |
| commit | 9d06ce128d13ecccf8378df99d6eb5e9815b2131 (patch) | |
| tree | 9a38d87026c7a2fae65d1a39d7020363f31462ae /arch/arm/mach-tegra/sleep.S | |
| parent | c6f117a6ae1748762f3f5ef7e8d510c75b364146 (diff) | |
Revert "arm: tegra: flush dcache before cluster switch"
This reverts commit a16d512e5b2a8d3ce9c4cc6e59a219b8c81b5164,
as we want to remove the dcache flush from the NS world
completely and piggy-back on the secure world's cache flush
operation to flush the NS cache lines.
Bug 1454640
Change-Id: Ia0973238f5203562f32fa785a19ecab5d8d920b5
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/368268
Diffstat (limited to 'arch/arm/mach-tegra/sleep.S')
| -rw-r--r-- | arch/arm/mach-tegra/sleep.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S index 75ed8db27990..b4827a16cf05 100644 --- a/arch/arm/mach-tegra/sleep.S +++ b/arch/arm/mach-tegra/sleep.S @@ -1,7 +1,7 @@ /* * arch/arm/mach-tegra/sleep.S * - * Copyright (c) 2010-2014, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2011, Google, Inc. * * Author: Colin Cross <ccross@android.com> @@ -213,9 +213,9 @@ ENTRY(tegra_sleep_cpu_finish) ldr r1, =((1 << 16) | 4) ldr r2, =TEGRA_RESET_HANDLER_BASE bl tegra_generic_smc -#endif - +#else bl tegra_flush_cache +#endif mov r0, r4 bl tegra_cpu_exit_coherency |