diff options
| author | Tom Rini <trini@ti.com> | 2014-09-26 09:57:52 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-09-26 09:57:52 -0400 |
| commit | 2c2277f15cbaa9533ef8aead7328c3f605251147 (patch) | |
| tree | 9e7ee343a1f75ecdd57a7fa8025eab2464654ecb /arch/arm/lib | |
| parent | 2c3dc792b6df16970077c0d64085e29f1f85d4c8 (diff) | |
| parent | c7eae7fcb11bc7dab519fca8d8902f1fbc5c3c76 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/gic_64.S | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/lib/gic_64.S b/arch/arm/lib/gic_64.S index d56396ea22..a3e18f7713 100644 --- a/arch/arm/lib/gic_64.S +++ b/arch/arm/lib/gic_64.S @@ -10,8 +10,8 @@ #include <asm-offsets.h> #include <config.h> #include <linux/linkage.h> -#include <asm/macro.h> #include <asm/gic.h> +#include <asm/macro.h> /************************************************************************* @@ -181,14 +181,10 @@ ENDPROC(gic_kick_secondary_cpus) * *************************************************************************/ ENTRY(gic_wait_for_interrupt) -0: wfi #if defined(CONFIG_GICV3) - mrs x9, ICC_IAR1_EL1 - msr ICC_EOIR1_EL1, x9 + gic_wait_for_interrupt_m x9 #elif defined(CONFIG_GICV2) - ldr w9, [x0, GICC_AIAR] - str w9, [x0, GICC_AEOIR] + gic_wait_for_interrupt_m x0, w9 #endif - cbnz w9, 0b ret ENDPROC(gic_wait_for_interrupt) |