diff options
| author | Olof Johansson | 2012-11-21 01:12:49 -0800 |
|---|---|---|
| committer | Olof Johansson | 2012-11-21 02:13:12 -0800 |
| commit | a33ee3e6949e244f9166a7f7e764886432304ecd (patch) | |
| tree | 257ae924259d68bea516f833c9728d596e7757b5 /arch/arm/kernel | |
| parent | 06f31cb0f601728f24b85c51972eee6bdc94a1d1 (diff) | |
| parent | 52530343331dc111e0899bfc976f21ace5b5c95c (diff) | |
Merge tag 'highbank-debugll-cleanup' of git://sources.calxeda.com/kernel/linux into next/soc
From Rob Herring:
Use common debug_ll_init function and remove the static mapping code
from mach-highbank.
* tag 'highbank-debugll-cleanup' of git://sources.calxeda.com/kernel/linux:
ARM: highbank: use common debug_ll_io_init
ARM: implement debug_ll_io_init()
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/debug.S | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index 66f711b2e0e8..6809200c31fb 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S @@ -100,6 +100,13 @@ ENTRY(printch) b 1b ENDPROC(printch) +ENTRY(debug_ll_addr) + addruart r2, r3, ip + str r2, [r0] + str r3, [r1] + mov pc, lr +ENDPROC(debug_ll_addr) + #else ENTRY(printascii) @@ -119,4 +126,11 @@ ENTRY(printch) mov pc, lr ENDPROC(printch) +ENTRY(debug_ll_addr) + mov r2, #0 + str r2, [r0] + str r2, [r1] + mov pc, lr +ENDPROC(debug_ll_addr) + #endif |