msm: fix debug-macro.S build failure
authorDaniel Walker <>
Wed, 27 Oct 2010 22:25:59 +0000 (15:25 -0700)
committerDaniel Walker <>
Fri, 29 Oct 2010 22:56:04 +0000 (15:56 -0700)
Originally there was an ifdef case to handle when no debug uart
was selected. In commit 0ea1293009826da45e1019f45dfde1e557bb30df
that case was removed which causes the following build failure,

linux-2.6/arch/arm/kernel/debug.S: Assembler messages:
linux-2.6/arch/arm/kernel/debug.S:174: Error: bad instruction `addruart r1,r2'
linux-2.6/arch/arm/kernel/debug.S:176: Error: bad instruction `waituart r2,r3'
linux-2.6/arch/arm/kernel/debug.S:177: Error: bad instruction `senduart r1,r3'
linux-2.6/arch/arm/kernel/debug.S:178: Error: bad instruction `busyuart r2,r3'
linux-2.6/arch/arm/kernel/debug.S:190: Error: bad instruction `addruart r1,r2'

This is a partial revert to add back the case which was removed with
two caveats. First the API for the addruart macro was updated, and
the new addruart case now return 0xfff00000 so that a know IO mapping
is created instead of a random one.

Cc: Jeremy Kerr <>
Cc: Lorenzo Pieralisi <>
Cc: Jason Wang <>
Cc: Tony Lindgren <>
Cc: Nicolas Pitre <>
Cc: Russell King - ARM Linux <>
Signed-off-by: Daniel Walker <>

index fbd5d90dcc8ce36ec411e8b8d1be04613a2742f0..f792e01d2c8e767169b2ed7645d3023d8e5eb44c 100644 (file)
        tst     \rd, #0x04
        beq     1001b
+       .macro  addruart, rp, rv
+       mov     \rv, #0xff000000
+       orr     \rv, \rv, #0x00f00000
+       .endm
-       .macro  busyuart,rd,rx
+       .macro  senduart,rd,rx
+       .endm
+       .macro  waituart,rd,rx
+       .macro  busyuart,rd,rx
+       .endm