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-footbridge | |
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-footbridge')
-rw-r--r-- | arch/arm/mach-footbridge/include/mach/debug-macro.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-footbridge/include/mach/debug-macro.S b/arch/arm/mach-footbridge/include/mach/debug-macro.S index 4329b8123570..60dda1318f22 100644 --- a/arch/arm/mach-footbridge/include/mach/debug-macro.S +++ b/arch/arm/mach-footbridge/include/mach/debug-macro.S | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | #ifndef CONFIG_DEBUG_DC21285_PORT | 16 | #ifndef CONFIG_DEBUG_DC21285_PORT |
17 | /* For NetWinder debugging */ | 17 | /* For NetWinder debugging */ |
18 | .macro addruart,rx | 18 | .macro addruart, rx, tmp |
19 | mrc p15, 0, \rx, c1, c0 | 19 | mrc p15, 0, \rx, c1, c0 |
20 | tst \rx, #1 @ MMU enabled? | 20 | tst \rx, #1 @ MMU enabled? |
21 | moveq \rx, #0x7c000000 @ physical | 21 | moveq \rx, #0x7c000000 @ physical |
@@ -32,7 +32,7 @@ | |||
32 | .equ dc21285_high, ARMCSR_BASE & 0xff000000 | 32 | .equ dc21285_high, ARMCSR_BASE & 0xff000000 |
33 | .equ dc21285_low, ARMCSR_BASE & 0x00ffffff | 33 | .equ dc21285_low, ARMCSR_BASE & 0x00ffffff |
34 | 34 | ||
35 | .macro addruart,rx | 35 | .macro addruart, rx, tmp |
36 | mrc p15, 0, \rx, c1, c0 | 36 | mrc p15, 0, \rx, c1, c0 |
37 | tst \rx, #1 @ MMU enabled? | 37 | tst \rx, #1 @ MMU enabled? |
38 | moveq \rx, #0x42000000 | 38 | moveq \rx, #0x42000000 |