diff options
Diffstat (limited to 'arch/arm/mach-davinci/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/debug-macro.S | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/arch/arm/mach-davinci/include/mach/debug-macro.S b/arch/arm/mach-davinci/include/mach/debug-macro.S index 3cf4c1b4f33a..45fff2c61f48 100644 --- a/arch/arm/mach-davinci/include/mach/debug-macro.S +++ b/arch/arm/mach-davinci/include/mach/debug-macro.S | |||
| @@ -50,21 +50,20 @@ davinci_uart_virt: .word 0 | |||
| 50 | mrc p15, 0, \rp, c1, c0 | 50 | mrc p15, 0, \rp, c1, c0 |
| 51 | tst \rp, #1 @ MMU enabled? | 51 | tst \rp, #1 @ MMU enabled? |
| 52 | 52 | ||
| 53 | /* Copy uart phys address from decompressor uart info */ | 53 | and \rp, pc, #0xff000000 |
| 54 | ldr \rv, =DAVINCI_UART_INFO_OFS | ||
| 55 | add \rp, \rp, \rv | ||
| 56 | |||
| 54 | ldreq \rv, =davinci_uart_v2p(davinci_uart_phys) | 57 | ldreq \rv, =davinci_uart_v2p(davinci_uart_phys) |
| 55 | ldrne \rv, =davinci_uart_phys | 58 | ldrne \rv, =davinci_uart_phys |
| 56 | ldreq \rp, =DAVINCI_UART_INFO | 59 | |
| 57 | ldrne \rp, =davinci_uart_p2v(DAVINCI_UART_INFO) | 60 | /* Copy uart phys address from decompressor uart info */ |
| 58 | ldr \rp, [\rp, #0] | 61 | ldr \tmp, [\rp, #0] |
| 59 | str \rp, [\rv] | 62 | str \tmp, [\rv, #0] |
| 60 | 63 | ||
| 61 | /* Copy uart virt address from decompressor uart info */ | 64 | /* Copy uart virt address from decompressor uart info */ |
| 62 | ldreq \rv, =davinci_uart_v2p(davinci_uart_virt) | 65 | ldr \tmp, [\rp, #4] |
| 63 | ldrne \rv, =davinci_uart_virt | 66 | str \tmp, [\rv, #4] |
| 64 | ldreq \rp, =DAVINCI_UART_INFO | ||
| 65 | ldrne \rp, =davinci_uart_p2v(DAVINCI_UART_INFO) | ||
| 66 | ldr \rp, [\rp, #4] | ||
| 67 | str \rp, [\rv] | ||
| 68 | 67 | ||
| 69 | b 10b | 68 | b 10b |
| 70 | 99: | 69 | 99: |