diff options
Diffstat (limited to 'arch/arm/mach-ixp23xx/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/debug-macro.S | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/mach-ixp23xx/include/mach/debug-macro.S b/arch/arm/mach-ixp23xx/include/mach/debug-macro.S index a82e375465e2..f7c6eef7fa22 100644 --- a/arch/arm/mach-ixp23xx/include/mach/debug-macro.S +++ b/arch/arm/mach-ixp23xx/include/mach/debug-macro.S | |||
| @@ -12,13 +12,12 @@ | |||
| 12 | */ | 12 | */ |
| 13 | #include <mach/ixp23xx.h> | 13 | #include <mach/ixp23xx.h> |
| 14 | 14 | ||
| 15 | .macro addruart, rx, tmp | 15 | .macro addruart, rp, rv |
| 16 | mrc p15, 0, \rx, c1, c0 | 16 | ldr \rp, =IXP23XX_PERIPHERAL_PHYS @ physical |
| 17 | tst \rx, #1 @ mmu enabled? | 17 | ldr \rv, =IXP23XX_PERIPHERAL_VIRT @ virtual |
| 18 | ldreq \rx, =IXP23XX_PERIPHERAL_PHYS @ physical | ||
| 19 | ldrne \rx, =IXP23XX_PERIPHERAL_VIRT @ virtual | ||
| 20 | #ifdef __ARMEB__ | 18 | #ifdef __ARMEB__ |
| 21 | orr \rx, \rx, #0x00000003 | 19 | orr \rp, \rp, #0x00000003 |
| 20 | orr \rv, \rv, #0x00000003 | ||
| 22 | #endif | 21 | #endif |
| 23 | .endm | 22 | .endm |
| 24 | 23 | ||