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

Commit 216251cf authored by Sascha Hauer's avatar Sascha Hauer Committed by Russell King
Browse files

[ARM] 3501/1: i.MX: fix lowlevel debug macros 



Patch from Sascha Hauer

This patch fixes the addruart macro to work with both mmu enabled and
disabled.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutonix.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f1226701

arch/arm/mach-imx/mx1ads.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ mx1ads_map_io(void) 
MACHINE_START(MX1ADS, "Motorola MX1ADS")

	/* Maintainer: Sascha Hauer, Pengutronix */

	.phys_io	= 0x00200000,

	.io_pg_offst	= ((0xe0200000) >> 18) & 0xfffc,

	.io_pg_offst	= ((0xe0000000) >> 18) & 0xfffc,

	.boot_params	= 0x08000100,

	.map_io		= mx1ads_map_io,

	.init_irq	= imx_init_irq,

include/asm-arm/arch-imx/debug-macro.S

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
		tst	\rx, #1			@ MMU enabled?

		moveq	\rx, #0x00000000	@ physical

		movne	\rx, #0xe0000000	@ virtual

		orr	\rx, \rx, #0x00200000

		orreq	\rx, \rx, #0x00200000	@ physical

		orr	\rx, \rx, #0x00006000	@ UART1 offset

		.endm