Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
[linux-3.10.git] / arch / arm / mach-omap2 / include / mach / debug-macro.S
index 6049f46..48adfe9 100644 (file)
@@ -72,6 +72,12 @@ omap_uart_lsr:       .word   0
                beq     34f                     @ configure OMAP3UART4
                cmp     \rp, #OMAP4UART4        @ only on 44xx
                beq     44f                     @ configure OMAP4UART4
+               cmp     \rp, #TI816XUART1       @ ti816x UART offsets different
+               beq     81f                     @ configure UART1
+               cmp     \rp, #TI816XUART2       @ ti816x UART offsets different
+               beq     82f                     @ configure UART2
+               cmp     \rp, #TI816XUART3       @ ti816x UART offsets different
+               beq     83f                     @ configure UART3
                cmp     \rp, #ZOOM_UART         @ only on zoom2/3
                beq     95f                     @ configure ZOOM_UART
 
@@ -94,6 +100,12 @@ omap_uart_lsr:      .word   0
                b       98f
 44:            mov     \rp, #UART_OFFSET(OMAP4_UART4_BASE)
                b       98f
+81:            mov     \rp, #UART_OFFSET(TI816X_UART1_BASE)
+               b       98f
+82:            mov     \rp, #UART_OFFSET(TI816X_UART2_BASE)
+               b       98f
+83:            mov     \rp, #UART_OFFSET(TI816X_UART3_BASE)
+               b       98f
 95:            ldr     \rp, =ZOOM_UART_BASE
                mrc     p15, 0, \rv, c1, c0
                tst     \rv, #1                 @ MMU enabled?