Commit 308d4fe2 authored by Tony Lindgren's avatar Tony Lindgren Committed by Russell King

[ARM PATCH] 1853/1: Update OMAP low level debug functions

Patch from Tony Lindgren

Changes OMAP low level debug function to allow virtual IO != physical
IO.  Also removes waituart checking, as it only worked for first
serial port.
parent 3c65c55d
...@@ -469,9 +469,24 @@ ...@@ -469,9 +469,24 @@
#include <asm/arch/serial.h> #include <asm/arch/serial.h>
#ifdef CONFIG_ARCH_OMAP730
#define OMAP_SERIAL_REG_SHIFT 0
#else
#define OMAP_SERIAL_REG_SHIFT 2
#endif
/* See also __create_page_tables in head.S */
.macro addruart,rx .macro addruart,rx
mov \rx, #0xff000000 mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ MMU enabled?
moveq \rx, #0xff000000 @ physical base address
movne \rx, #0xfe000000 @ virtual base
orr \rx, \rx, #0x00fb0000 orr \rx, \rx, #0x00fb0000
#ifdef CONFIG_OMAP_LL_DEBUG_UART3
orr \rx, \rx, #0x00009000 @ UART 3
#endif
#if defined(CONFIG_OMAP_LL_DEBUG_UART2) || defined(CONFIG_OMAP_LL_DEBUG_UART3)
orr \rx, \rx, #0x00000800 @ UART 2 & 3
#endif
.endm .endm
.macro senduart,rd,rx .macro senduart,rd,rx
...@@ -486,9 +501,6 @@ ...@@ -486,9 +501,6 @@
.endm .endm
.macro waituart,rd,rx .macro waituart,rd,rx
1001: ldrb \rd, [\rx, #(0x6 << OMAP_SERIAL_REG_SHIFT)]
tst \rd, #0x10
beq 1001b
.endm .endm
#elif defined(CONFIG_ARCH_S3C2410) #elif defined(CONFIG_ARCH_S3C2410)
......
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