ARM: tegra: fix regression from addruart rewrite
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:
Родитель
7787d2c2f4
Коммит
da8f2e2461
|
@ -21,8 +21,8 @@
|
||||||
#include <mach/io.h>
|
#include <mach/io.h>
|
||||||
|
|
||||||
.macro addruart, rp, rv
|
.macro addruart, rp, rv
|
||||||
ldreq \rp, =IO_APB_PHYS @ physical
|
ldr \rp, =IO_APB_PHYS @ physical
|
||||||
ldrne \rv, =IO_APB_VIRT @ virtual
|
ldr \rv, =IO_APB_VIRT @ virtual
|
||||||
#if defined(CONFIG_TEGRA_DEBUG_UART_NONE)
|
#if defined(CONFIG_TEGRA_DEBUG_UART_NONE)
|
||||||
#error "A debug UART must be selected in the kernel config to use DEBUG_LL"
|
#error "A debug UART must be selected in the kernel config to use DEBUG_LL"
|
||||||
#elif defined(CONFIG_TEGRA_DEBUG_UARTA)
|
#elif defined(CONFIG_TEGRA_DEBUG_UARTA)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче