summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/entry-macro-multi.S
diff options
context:
space:
mode:
authorAnthony Felice <tony.felice@timesys.com>2013-11-07 11:55:15 -0500
committerAnthony Felice <tony.felice@timesys.com>2013-11-07 11:55:15 -0500
commit8dbbf996897e1d5878f3f5fd5fff5adedb04f3b8 (patch)
tree7cf8054eb498f5b7dcb3118a9e2bebe311134125 /arch/arm/include/asm/entry-macro-multi.S
parent498b5774630e0c8ac7dadd72fce5ceb555f741b8 (diff)
Add Global Timer support to fix High Resolution Timer functionality.
This patch was submitted by Yoshihisa Ozawa <ozawa@lineo.co.jp> in ticket #52306.
Diffstat (limited to 'arch/arm/include/asm/entry-macro-multi.S')
-rw-r--r--arch/arm/include/asm/entry-macro-multi.S7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/include/asm/entry-macro-multi.S b/arch/arm/include/asm/entry-macro-multi.S
index 2da8547de6d6..1b32239a6665 100644
--- a/arch/arm/include/asm/entry-macro-multi.S
+++ b/arch/arm/include/asm/entry-macro-multi.S
@@ -33,6 +33,13 @@
bne do_local_timer
#endif
#endif
+
+#if defined(CONFIG_ARCH_MVF) && !defined(CONFIG_MXC_USE_PIT) /* MVF Global Timer Support*/
+ test_for_gtirq r0, r6, r5, lr
+ movne r0, sp
+ adrne lr, BSYM(1b)
+ bne do_global_timer
+#endif
9997:
.endm