diff options
Diffstat (limited to 'include/asm-arm/arch-ebsa285')
-rw-r--r-- | include/asm-arm/arch-ebsa285/entry-macro.S | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/asm-arm/arch-ebsa285/entry-macro.S b/include/asm-arm/arch-ebsa285/entry-macro.S index 4203dbf10662..e63064edb734 100644 --- a/include/asm-arm/arch-ebsa285/entry-macro.S +++ b/include/asm-arm/arch-ebsa285/entry-macro.S | |||
@@ -11,24 +11,24 @@ | |||
11 | #include <asm/arch/irqs.h> | 11 | #include <asm/arch/irqs.h> |
12 | #include <asm/hardware/dec21285.h> | 12 | #include <asm/hardware/dec21285.h> |
13 | 13 | ||
14 | .equ dc21285_high, ARMCSR_BASE & 0xff000000 | ||
15 | .equ dc21285_low, ARMCSR_BASE & 0x00ffffff | ||
16 | |||
14 | .macro disable_fiq | 17 | .macro disable_fiq |
15 | .endm | 18 | .endm |
16 | 19 | ||
17 | .macro get_irqnr_preamble, base, tmp | 20 | .macro get_irqnr_preamble, base, tmp |
21 | mov \base, #dc21285_high | ||
22 | .if dc21285_low | ||
23 | orr \base, \base, #dc21285_low | ||
24 | .endif | ||
18 | .endm | 25 | .endm |
19 | 26 | ||
20 | .macro arch_ret_to_user, tmp1, tmp2 | 27 | .macro arch_ret_to_user, tmp1, tmp2 |
21 | .endm | 28 | .endm |
22 | 29 | ||
23 | .equ dc21285_high, ARMCSR_BASE & 0xff000000 | ||
24 | .equ dc21285_low, ARMCSR_BASE & 0x00ffffff | ||
25 | |||
26 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp | 30 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp |
27 | mov r4, #dc21285_high | 31 | ldr \irqstat, [\base, #0x180] @ get interrupts |
28 | .if dc21285_low | ||
29 | orr r4, r4, #dc21285_low | ||
30 | .endif | ||
31 | ldr \irqstat, [r4, #0x180] @ get interrupts | ||
32 | 32 | ||
33 | mov \irqnr, #IRQ_SDRAMPARITY | 33 | mov \irqnr, #IRQ_SDRAMPARITY |
34 | tst \irqstat, #IRQ_MASK_SDRAMPARITY | 34 | tst \irqstat, #IRQ_MASK_SDRAMPARITY |