diff options
Diffstat (limited to 'arch/arm/mach-tegra/reset-handler.S')
-rw-r--r-- | arch/arm/mach-tegra/reset-handler.S | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/reset-handler.S b/arch/arm/mach-tegra/reset-handler.S index 8c1ba4fea384..578d4d1ad648 100644 --- a/arch/arm/mach-tegra/reset-handler.S +++ b/arch/arm/mach-tegra/reset-handler.S | |||
@@ -19,7 +19,6 @@ | |||
19 | 19 | ||
20 | #include <asm/cache.h> | 20 | #include <asm/cache.h> |
21 | #include <asm/asm-offsets.h> | 21 | #include <asm/asm-offsets.h> |
22 | #include <asm/hardware/cache-l2x0.h> | ||
23 | 22 | ||
24 | #include "flowctrl.h" | 23 | #include "flowctrl.h" |
25 | #include "fuse.h" | 24 | #include "fuse.h" |
@@ -78,8 +77,10 @@ ENTRY(tegra_resume) | |||
78 | str r1, [r0] | 77 | str r1, [r0] |
79 | #endif | 78 | #endif |
80 | 79 | ||
80 | #ifdef CONFIG_CACHE_L2X0 | ||
81 | /* L2 cache resume & re-enable */ | 81 | /* L2 cache resume & re-enable */ |
82 | l2_cache_resume r0, r1, r2, l2x0_saved_regs_addr | 82 | bl l2c310_early_resume |
83 | #endif | ||
83 | end_ca9_scu_l2_resume: | 84 | end_ca9_scu_l2_resume: |
84 | mov32 r9, 0xc0f | 85 | mov32 r9, 0xc0f |
85 | cmp r8, r9 | 86 | cmp r8, r9 |
@@ -89,12 +90,6 @@ end_ca9_scu_l2_resume: | |||
89 | ENDPROC(tegra_resume) | 90 | ENDPROC(tegra_resume) |
90 | #endif | 91 | #endif |
91 | 92 | ||
92 | #ifdef CONFIG_CACHE_L2X0 | ||
93 | .globl l2x0_saved_regs_addr | ||
94 | l2x0_saved_regs_addr: | ||
95 | .long 0 | ||
96 | #endif | ||
97 | |||
98 | .align L1_CACHE_SHIFT | 93 | .align L1_CACHE_SHIFT |
99 | ENTRY(__tegra_cpu_reset_handler_start) | 94 | ENTRY(__tegra_cpu_reset_handler_start) |
100 | 95 | ||