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

Commit 59778fb6 authored by Rabin Vincent's avatar Rabin Vincent Committed by Russell King
Browse files

ARM: 5932/1: ux500: fix DEBUG_LL/earlyprintk 



Add a static mapping for the UART and correct its virtual address in
debug-macro.S, to make DEBUG_LL/earlyprintk work.

Acked-by: default avatarSrinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Acked-by: default avatarLinus Walleij <linus.walleij@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 c72881e8

arch/arm/mach-ux500/cpu-u8500.c

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ static struct platform_device *platform_devs[] __initdata = { 


/* minimum static i/o mapping required to boot U8500 platforms */

static struct map_desc u8500_io_desc[] __initdata = {

	__IO_DEV_DESC(U8500_UART2_BASE, SZ_4K),

	__IO_DEV_DESC(U8500_GIC_CPU_BASE, SZ_4K),

	__IO_DEV_DESC(U8500_GIC_DIST_BASE, SZ_4K),

	__IO_DEV_DESC(U8500_MTU0_BASE, SZ_4K),

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

+5 −4
Original line number Diff line number Diff line
@@ -8,12 +8,13 @@ 
 * published by the Free Software Foundation.

 *

 */

#include <mach/hardware.h>



	.macro	addruart,rx

	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

	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>