diff options
Diffstat (limited to 'arch/arm/mach-omap2/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-omap2/include/mach/debug-macro.S | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/include/mach/debug-macro.S b/arch/arm/mach-omap2/include/mach/debug-macro.S index cdfc2a1f0e75..93d10de7129f 100644 --- a/arch/arm/mach-omap2/include/mach/debug-macro.S +++ b/arch/arm/mach-omap2/include/mach/debug-macro.S | |||
| @@ -60,18 +60,20 @@ omap_uart_lsr: .word 0 | |||
| 60 | beq 23f @ configure OMAP2UART3 | 60 | beq 23f @ configure OMAP2UART3 |
| 61 | cmp \rp, #OMAP3UART3 @ only on 34xx | 61 | cmp \rp, #OMAP3UART3 @ only on 34xx |
| 62 | beq 33f @ configure OMAP3UART3 | 62 | beq 33f @ configure OMAP3UART3 |
| 63 | cmp \rp, #OMAP4UART3 @ only on 44xx | 63 | cmp \rp, #OMAP4UART3 @ only on 44xx/54xx |
| 64 | beq 43f @ configure OMAP4UART3 | 64 | beq 43f @ configure OMAP4/5UART3 |
| 65 | cmp \rp, #OMAP3UART4 @ only on 36xx | 65 | cmp \rp, #OMAP3UART4 @ only on 36xx |
| 66 | beq 34f @ configure OMAP3UART4 | 66 | beq 34f @ configure OMAP3UART4 |
| 67 | cmp \rp, #OMAP4UART4 @ only on 44xx | 67 | cmp \rp, #OMAP4UART4 @ only on 44xx/54xx |
| 68 | beq 44f @ configure OMAP4UART4 | 68 | beq 44f @ configure OMAP4/5UART4 |
| 69 | cmp \rp, #TI81XXUART1 @ ti81Xx UART offsets different | 69 | cmp \rp, #TI81XXUART1 @ ti81Xx UART offsets different |
| 70 | beq 81f @ configure UART1 | 70 | beq 81f @ configure UART1 |
| 71 | cmp \rp, #TI81XXUART2 @ ti81Xx UART offsets different | 71 | cmp \rp, #TI81XXUART2 @ ti81Xx UART offsets different |
| 72 | beq 82f @ configure UART2 | 72 | beq 82f @ configure UART2 |
| 73 | cmp \rp, #TI81XXUART3 @ ti81Xx UART offsets different | 73 | cmp \rp, #TI81XXUART3 @ ti81Xx UART offsets different |
| 74 | beq 83f @ configure UART3 | 74 | beq 83f @ configure UART3 |
| 75 | cmp \rp, #AM33XXUART1 @ AM33XX UART offsets different | ||
| 76 | beq 84f @ configure UART1 | ||
| 75 | cmp \rp, #ZOOM_UART @ only on zoom2/3 | 77 | cmp \rp, #ZOOM_UART @ only on zoom2/3 |
| 76 | beq 95f @ configure ZOOM_UART | 78 | beq 95f @ configure ZOOM_UART |
| 77 | 79 | ||
| @@ -100,7 +102,9 @@ omap_uart_lsr: .word 0 | |||
| 100 | b 98f | 102 | b 98f |
| 101 | 83: mov \rp, #UART_OFFSET(TI81XX_UART3_BASE) | 103 | 83: mov \rp, #UART_OFFSET(TI81XX_UART3_BASE) |
| 102 | b 98f | 104 | b 98f |
| 103 | 105 | 84: ldr \rp, =AM33XX_UART1_BASE | |
| 106 | and \rp, \rp, #0x00ffffff | ||
| 107 | b 97f | ||
| 104 | 95: ldr \rp, =ZOOM_UART_BASE | 108 | 95: ldr \rp, =ZOOM_UART_BASE |
| 105 | str \rp, [\tmp, #0] @ omap_uart_phys | 109 | str \rp, [\tmp, #0] @ omap_uart_phys |
| 106 | ldr \rp, =ZOOM_UART_VIRT | 110 | ldr \rp, =ZOOM_UART_VIRT |
| @@ -109,6 +113,17 @@ omap_uart_lsr: .word 0 | |||
| 109 | str \rp, [\tmp, #8] @ omap_uart_lsr | 113 | str \rp, [\tmp, #8] @ omap_uart_lsr |
| 110 | b 10b | 114 | b 10b |
| 111 | 115 | ||
| 116 | /* AM33XX: Store both phys and virt address for the uart */ | ||
| 117 | 97: add \rp, \rp, #0x44000000 @ phys base | ||
| 118 | str \rp, [\tmp, #0] @ omap_uart_phys | ||
| 119 | sub \rp, \rp, #0x44000000 @ phys base | ||
| 120 | add \rp, \rp, #0xf9000000 @ virt base | ||
| 121 | str \rp, [\tmp, #4] @ omap_uart_virt | ||
| 122 | mov \rp, #(UART_LSR << OMAP_PORT_SHIFT) | ||
| 123 | str \rp, [\tmp, #8] @ omap_uart_lsr | ||
| 124 | |||
| 125 | b 10b | ||
| 126 | |||
| 112 | /* Store both phys and virt address for the uart */ | 127 | /* Store both phys and virt address for the uart */ |
| 113 | 98: add \rp, \rp, #0x48000000 @ phys base | 128 | 98: add \rp, \rp, #0x48000000 @ phys base |
| 114 | str \rp, [\tmp, #0] @ omap_uart_phys | 129 | str \rp, [\tmp, #0] @ omap_uart_phys |