dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

ARM: 6079/1: ux500: allow choice of the DEBUG_LL UART 

Allow the UART used for DEBUG_LL to be selected.

Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Rabin Vincent 2010-05-03 07:38:06 +01:00 committed by Russell King
parent c9c0957286
commit 39a982b4cd
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-ux500/Kconfig
View File

@ -27,4 +27,11 @@ config MACH_U8500_MOP
on early drop silicon version of 8500.
endmenu
config UX500_DEBUG_UART
int "Ux500 UART to use for low-level debug"
default 2
help
Choose the UART on which kernel low-level debug messages should be
output.
endif

12
arch/arm/mach-ux500/include/mach/debug-macro.S
View File

@ -10,11 +10,19 @@
*/
#include <mach/hardware.h>
#if CONFIG_UX500_DEBUG_UART > 2
#error Invalid Ux500 debug UART
#endif
#define __UX500_UART(n) UX500_UART##n##_BASE
#define UX500_UART(n) __UX500_UART(n)
#define UART_BASE UX500_UART(CONFIG_UX500_DEBUG_UART)
.macro addruart, rx, tmp
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ MMU enabled?
ldreq \rx, =U8500_UART2_BASE @ no, physical address
ldrne \rx, =IO_ADDRESS(U8500_UART2_BASE) @ yes, virtual address
ldreq \rx, =UART_BASE @ no, physical address
ldrne \rx, =IO_ADDRESS(UART_BASE) @ yes, virtual address
.endm
#include <asm/hardware/debug-pl01x.S>