Commit da8f2e24 authored by Olof Johansson's avatar Olof Johansson Committed by Linus Torvalds

ARM: tegra: fix regression from addruart rewrite

Commit 0ea12930 ("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: default avatarOlof Johansson <olof@lixom.net>
Acked-by: default avatarColin Cross <ccross@android.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7787d2c2
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment