Merge branch 'topic/hda-gateway' into topic/hda

[sfrench/cifs-2.6.git] / arch / arm / mach-msm / include / mach / debug-macro.S

diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S
index 528eef4b605cdf1ee7c4b75899e6efc441f06744..1db3c97dbc49e4738d386396a5db3e6169cb7785 100644 (file)
--- a/arch/arm/mach-msm/include/mach/debug-macro.S
+++ b/arch/arm/mach-msm/include/mach/debug-macro.S
@@ -22,18 +22,22 @@
        mrc     p15, 0, \rx, c1, c0
        tst     \rx, #1
        ldreq   \rx, =MSM_UART1_PHYS
-       ldrne   \rx, =MSM_UART1_BASE
+       movne   \rx, #0
        .endm
 
        .macro  senduart,rd,rx
-       str     \rd, [\rx, #0x0C]
+       teq     \rx, #0
+       strne   \rd, [\rx, #0x0C]
        .endm
 
        .macro  waituart,rd,rx
        @ wait for TX_READY
+       teq     \rx, #0
+       bne     2f
 1:     ldr     \rd, [\rx, #0x08]
        tst     \rd, #0x04
        beq     1b
+2:
        .endm
 
        .macro  busyuart,rd,rx