tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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: Sascha Hauer <s.hauer@pengutonix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by Sascha Hauer and committed by Russell King 216251cf f1226701

+2 -2
unified split
+1 -1
arch/arm/mach-imx/mx1ads.c
··· 161 MACHINE_START(MX1ADS, "Motorola MX1ADS") 162 /* Maintainer: Sascha Hauer, Pengutronix */ 163 .phys_io = 0x00200000, 164 - .io_pg_offst = ((0xe0200000) >> 18) & 0xfffc, 165 .boot_params = 0x08000100, 166 .map_io = mx1ads_map_io, 167 .init_irq = imx_init_irq,
··· 161 MACHINE_START(MX1ADS, "Motorola MX1ADS") 162 /* Maintainer: Sascha Hauer, Pengutronix */ 163 .phys_io = 0x00200000, 164 + .io_pg_offst = ((0xe0000000) >> 18) & 0xfffc, 165 .boot_params = 0x08000100, 166 .map_io = mx1ads_map_io, 167 .init_irq = imx_init_irq,
+1 -1
include/asm-arm/arch-imx/debug-macro.S
··· 16 tst \rx, #1 @ MMU enabled? 17 moveq \rx, #0x00000000 @ physical 18 movne \rx, #0xe0000000 @ virtual 19 - orr \rx, \rx, #0x00200000 20 orr \rx, \rx, #0x00006000 @ UART1 offset 21 .endm 22
··· 16 tst \rx, #1 @ MMU enabled? 17 moveq \rx, #0x00000000 @ physical 18 movne \rx, #0xe0000000 @ virtual 19 + orreq \rx, \rx, #0x00200000 @ physical 20 orr \rx, \rx, #0x00006000 @ UART1 offset 21 .endm 22