diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-08-03 08:59:34 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:47:01 -0800 |
| commit | 04f422436a909b531c4b416aed1896c87d66c7d6 (patch) | |
| tree | 81ea302483242b055d3c7c3d21074d214f024fe8 /arch/arm/mach-tegra/sleep-t2.S | |
| parent | b7cf99a4264f634f293f278e3a62eda0f63f38a5 (diff) | |
ARM: tegra: Use common coherency exit function for Tegra2
Change-Id: Ibbc9c2a38fb654e24b1edb4ee7bbcaf285bf0f7d
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
Rebase-Id: R9ff092cf658b71d8f79ef3901bd5067d18548e69
Diffstat (limited to 'arch/arm/mach-tegra/sleep-t2.S')
| -rw-r--r-- | arch/arm/mach-tegra/sleep-t2.S | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/arch/arm/mach-tegra/sleep-t2.S b/arch/arm/mach-tegra/sleep-t2.S index c94043e44590..6b6de9b8d91e 100644 --- a/arch/arm/mach-tegra/sleep-t2.S +++ b/arch/arm/mach-tegra/sleep-t2.S @@ -79,24 +79,13 @@ * should never return */ ENTRY(tegra2_hotplug_shutdown) - cpu_id r0 - - /* Exit coherency. */ - mrc p15, 0, r3, c1, c0, 1 @ ACTLR - bic r3, r3, #(1<<6) @ exit coherency SCTLR.SMP - mcr p15, 0, r3, c1, c0, 1 @ ACTLR - isb - - /* Invalidate the SCU tags for this CPU. */ - mov32 r3, TEGRA_ARM_PERIF_VIRT + 0xC @ SCUIAR - mov r2, r0, lsl #2 - mov r1, #0xf - mov r1, r1, lsl r2 @ 0xF << (cpu * 4) - str r1, [r3] @ invalidate SCU tags for CPU + mov r6, lr + bl tegra_cpu_exit_coherency /* Put this CPU into reset. */ + cpu_id r0 bl tegra2_cpu_reset - mov pc, lr + mov pc, r6 ENDPROC(tegra2_hotplug_shutdown) #endif |