leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: tegra: fix regression from addruart rewrite

Browse Source 
Commit 0ea1293009 ("arm: return both physical and virtual addresses
from addruart") took out the test for MMU on/off but didn't switch the
ldr instructions to no longer be conditionals based on said test.

Fix that.

Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Colin Cross <ccross@android.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Olof Johansson 2010-12-06 19:36:32 -06:00 committed by Linus Torvalds
parent 7787d2c2f4
commit da8f2e2461
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-tegra/include/mach/debug-macro.S
View File

@ -21,8 +21,8 @@
#include <mach/io.h>
.macro addruart, rp, rv
ldreq \rp, =IO_APB_PHYS @ physical
ldrne \rv, =IO_APB_VIRT @ virtual
ldr \rp, =IO_APB_PHYS @ physical
ldr \rv, =IO_APB_VIRT @ virtual
#if defined(CONFIG_TEGRA_DEBUG_UART_NONE)
#error "A debug UART must be selected in the kernel config to use DEBUG_LL"
#elif defined(CONFIG_TEGRA_DEBUG_UARTA)