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-gemini | |
| 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-gemini')
| -rw-r--r-- | arch/arm/mach-gemini/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-gemini/include/mach/debug-macro.S b/arch/arm/mach-gemini/include/mach/debug-macro.S index d04a6eaeae14..ad477047069d 100644 --- a/arch/arm/mach-gemini/include/mach/debug-macro.S +++ b/arch/arm/mach-gemini/include/mach/debug-macro.S | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | #include <mach/hardware.h> | 12 | #include <mach/hardware.h> |
| 13 | 13 | ||
| 14 | .macro addruart,rx | 14 | .macro addruart, rx, tmp |
| 15 | mrc p15, 0, \rx, c1, c0 | 15 | mrc p15, 0, \rx, c1, c0 |
| 16 | tst \rx, #1 @ MMU enabled? | 16 | tst \rx, #1 @ MMU enabled? |
| 17 | ldreq \rx, =GEMINI_UART_BASE @ physical | 17 | ldreq \rx, =GEMINI_UART_BASE @ physical |