diff options
Diffstat (limited to 'arch/arm/mach-iop13xx/include/mach/debug-macro.S')
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/debug-macro.S | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/arm/mach-iop13xx/include/mach/debug-macro.S b/arch/arm/mach-iop13xx/include/mach/debug-macro.S index c9d6ba46963d..e664466d51bf 100644 --- a/arch/arm/mach-iop13xx/include/mach/debug-macro.S +++ b/arch/arm/mach-iop13xx/include/mach/debug-macro.S | |||
@@ -11,15 +11,13 @@ | |||
11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | .macro addruart, rx, tmp | 14 | .macro addruart, rp, rv |
15 | mrc p15, 0, \rx, c1, c0 | 15 | mov \rp, #0x00002300 |
16 | tst \rx, #1 @ mmu enabled? | 16 | orr \rp, \rp, #0x00000040 |
17 | moveq \rx, #0xff000000 @ physical | 17 | orr \rv, \rp, #0xfe000000 @ virtual |
18 | orreq \rx, \rx, #0x00d80000 | 18 | orr \rv, \rv, #0x00e80000 |
19 | movne \rx, #0xfe000000 @ virtual | 19 | orr \rp, \rp, #0xff000000 @ physical |
20 | orrne \rx, \rx, #0x00e80000 | 20 | orr \rp, \rp, #0x00d80000 |
21 | orr \rx, \rx, #0x00002300 | ||
22 | orr \rx, \rx, #0x00000040 | ||
23 | .endm | 21 | .endm |
24 | 22 | ||
25 | #define UART_SHIFT 2 | 23 | #define UART_SHIFT 2 |