git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.39-rc6' into x86/cleanups
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-davinci/include/mach/debug-macro.S
b/arch/arm/mach-davinci/include/mach/debug-macro.S
index
9f1befc
..
f8b7ea4
100644
(file)
--- a/
arch/arm/mach-davinci/include/mach/debug-macro.S
+++ b/
arch/arm/mach-davinci/include/mach/debug-macro.S
@@
-24,6
+24,9
@@
#define UART_SHIFT 2
#define UART_SHIFT 2
+#define davinci_uart_v2p(x) ((x) - PAGE_OFFSET + PLAT_PHYS_OFFSET)
+#define davinci_uart_p2v(x) ((x) - PLAT_PHYS_OFFSET + PAGE_OFFSET)
+
.pushsection .data
davinci_uart_phys: .word 0
davinci_uart_virt: .word 0
.pushsection .data
davinci_uart_phys: .word 0
davinci_uart_virt: .word 0
@@
-34,7
+37,7
@@
davinci_uart_virt: .word 0
/* Use davinci_uart_phys/virt if already configured */
10: mrc p15, 0, \rp, c1, c0
tst \rp, #1 @ MMU enabled?
/* Use davinci_uart_phys/virt if already configured */
10: mrc p15, 0, \rp, c1, c0
tst \rp, #1 @ MMU enabled?
- ldreq \rp, =
__virt_to_phys
(davinci_uart_phys)
+ ldreq \rp, =
davinci_uart_v2p
(davinci_uart_phys)
ldrne \rp, =davinci_uart_phys
add \rv, \rp, #4 @ davinci_uart_virt
ldr \rp, [\rp, #0]
ldrne \rp, =davinci_uart_phys
add \rv, \rp, #4 @ davinci_uart_virt
ldr \rp, [\rp, #0]
@@
-48,18
+51,18
@@
davinci_uart_virt: .word 0
tst \rp, #1 @ MMU enabled?
/* Copy uart phys address from decompressor uart info */
tst \rp, #1 @ MMU enabled?
/* Copy uart phys address from decompressor uart info */
- ldreq \rv, =
__virt_to_phys
(davinci_uart_phys)
+ ldreq \rv, =
davinci_uart_v2p
(davinci_uart_phys)
ldrne \rv, =davinci_uart_phys
ldreq \rp, =DAVINCI_UART_INFO
ldrne \rv, =davinci_uart_phys
ldreq \rp, =DAVINCI_UART_INFO
- ldrne \rp, =
__phys_to_virt
(DAVINCI_UART_INFO)
+ ldrne \rp, =
davinci_uart_p2v
(DAVINCI_UART_INFO)
ldr \rp, [\rp, #0]
str \rp, [\rv]
/* Copy uart virt address from decompressor uart info */
ldr \rp, [\rp, #0]
str \rp, [\rv]
/* Copy uart virt address from decompressor uart info */
- ldreq \rv, =
__virt_to_phys
(davinci_uart_virt)
+ ldreq \rv, =
davinci_uart_v2p
(davinci_uart_virt)
ldrne \rv, =davinci_uart_virt
ldreq \rp, =DAVINCI_UART_INFO
ldrne \rv, =davinci_uart_virt
ldreq \rp, =DAVINCI_UART_INFO
- ldrne \rp, =
__phys_to_virt
(DAVINCI_UART_INFO)
+ ldrne \rp, =
davinci_uart_p2v
(DAVINCI_UART_INFO)
ldr \rp, [\rp, #4]
str \rp, [\rv]
ldr \rp, [\rp, #4]
str \rp, [\rv]