diff options
author | Tony Lindgren <tony@atomide.com> | 2010-02-01 17:26:53 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-12 12:27:52 -0500 |
commit | 4e6d488af37980d224cbf298224db6173673f362 (patch) | |
tree | 5e5d7276f321c239c129031892ec08a3ba034c2f /arch/arm/mach-msm/include | |
parent | 200b7a8dc09504bc0aedac567a307a6e533f39e5 (diff) |
ARM: 5910/1: ARM: Add tmp register for addruart and loadsp
Otherwise more complicated uart configuration won't be possible.
We can use r1 for tmp register for both head.S and debug.S.
NOTE: This patch depends on another patch to add the the tmp register
into all debug-macro.S files. That can be done with:
$ sed -i -e "s/addruart,rx|addruart, rx/addruart, rx, tmp/"
arch/arm/*/include/*/debug-macro.S
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-msm/include')
-rw-r--r-- | arch/arm/mach-msm/include/mach/debug-macro.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S index d48747ebcd3..528750f307e 100644 --- a/arch/arm/mach-msm/include/mach/debug-macro.S +++ b/arch/arm/mach-msm/include/mach/debug-macro.S | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <mach/msm_iomap.h> | 20 | #include <mach/msm_iomap.h> |
21 | 21 | ||
22 | #ifdef CONFIG_MSM_DEBUG_UART | 22 | #ifdef CONFIG_MSM_DEBUG_UART |
23 | .macro addruart,rx | 23 | .macro addruart, rx, tmp |
24 | @ see if the MMU is enabled and select appropriate base address | 24 | @ see if the MMU is enabled and select appropriate base address |
25 | mrc p15, 0, \rx, c1, c0 | 25 | mrc p15, 0, \rx, c1, c0 |
26 | tst \rx, #1 | 26 | tst \rx, #1 |
@@ -40,7 +40,7 @@ | |||
40 | beq 1001b | 40 | beq 1001b |
41 | .endm | 41 | .endm |
42 | #else | 42 | #else |
43 | .macro addruart,rx | 43 | .macro addruart, rx, tmp |
44 | .endm | 44 | .endm |
45 | 45 | ||
46 | .macro senduart,rd,rx | 46 | .macro senduart,rd,rx |