diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2014-03-06 16:10:41 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2014-03-14 05:23:08 -0700 |
| commit | 1763e277f350fb6f5c277a022d0ef9fa97b3b15a (patch) | |
| tree | 0c4d8d7567666ce01ea0b775b0fd115d94c4f8ad /arch/arm/mach-tegra/sleep.S | |
| parent | f8b6f21961075b10e0101e9d40b5aa8091a6aa7a (diff) | |
arm: tegra: use PSCI interfaces
ARM defines PSCI interfaces to be used for power states. We have
been using the actual semantics for quite some time now and so
can remove our implementation of the SMC issuing code and use the
generic interfaces present in <arm/arm64>/kernel/psci.c.
Bug 1475528
Change-Id: Ieba8a0a54f5ee731626e7d92a767ef044e88f12d
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/378354
Diffstat (limited to 'arch/arm/mach-tegra/sleep.S')
| -rw-r--r-- | arch/arm/mach-tegra/sleep.S | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S index b4827a16cf05..cd2836dfa728 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-2013, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2010-2014, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2011, Google, Inc. * * Author: Colin Cross <ccross@android.com> @@ -207,17 +207,9 @@ ENDPROC(tegra_flush_l1_cache) * tegra?_tear_down_cpu */ ENTRY(tegra_sleep_cpu_finish) - mov r4, r0 -#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) - ldr r0, =0x84000001 - ldr r1, =((1 << 16) | 4) - ldr r2, =TEGRA_RESET_HANDLER_BASE - bl tegra_generic_smc -#else +#if !defined(CONFIG_TEGRA_USE_SECURE_KERNEL) bl tegra_flush_cache #endif - - mov r0, r4 bl tegra_cpu_exit_coherency #ifdef CONFIG_ARCH_TEGRA_2x_SOC @@ -350,18 +342,7 @@ ENDPROC(tegra_cpu_pllp) * the specified parameters. */ ENTRY(tegra_generic_smc) - mov r3, #0 - dsb - smc #0 -restart: - ldr r3, =0xFFFFFFFD - cmp r0, r3 - bne done - mov r0, #(60 << 24) - dsb smc #0 - b restart -done: mov pc, lr ENDPROC(tegra_generic_smc) #endif |