Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39a982b4 authored by Rabin Vincent's avatar Rabin Vincent Committed by Russell King
Browse files

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



Allow the UART used for DEBUG_LL to be selected.

Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Acked-by: default avatarSrinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: default avatarRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c9c09572

arch/arm/mach-ux500/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-ux500/include/mach/debug-macro.S

+10 −2
Original line number Diff line number Diff line
@@ -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>