diff options
Diffstat (limited to 'arch/arm/mach-ux500/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/debug-macro.S | 11 | 
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-ux500/include/mach/debug-macro.S b/arch/arm/mach-ux500/include/mach/debug-macro.S index 8f21b6a95dc..09cbfda8aee 100644 --- a/arch/arm/mach-ux500/include/mach/debug-macro.S +++ b/arch/arm/mach-ux500/include/mach/debug-macro.S @@ -8,12 +8,13 @@   * published by the Free Software Foundation.   *   */ -	.macro	addruart,rx +#include <mach/hardware.h> + +	.macro	addruart, rx, tmp  	mrc	p15, 0, \rx, c1, c0 -	tst	\rx, #1			@MMU enabled? -	moveq	\rx, #0x80000000	@MMU off, Physical address -	movne	\rx, #0xF0000000	@MMU on, Virtual address -	orr	\rx, \rx, #0x7000 +	tst	\rx, #1					@ MMU enabled? +	ldreq	\rx, =U8500_UART2_BASE			@ no, physical address +	ldrne	\rx, =IO_ADDRESS(U8500_UART2_BASE)	@ yes, virtual address  	.endm  #include <asm/hardware/debug-pl01x.S>  |