diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-12-16 17:01:03 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-12-16 17:01:03 -0500 |
| commit | 7f760f1abcd1a36b52776c90f6a601dd90f06ecb (patch) | |
| tree | c5f29a48b528ecc352dbc5c2a246d7860177ac59 /arch/arm/mach-omap2/include | |
| parent | 9d297f5ee1b92a84e2cd6c547c3ac1f893128359 (diff) | |
| parent | da27468655540b083525177f5dc6f3b1f6e3b869 (diff) | |
Merge branch 'for_3.3/uart/runtime-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into uart
Conflicts:
arch/arm/mach-omap2/pm34xx.c
Diffstat (limited to 'arch/arm/mach-omap2/include')
| -rw-r--r-- | arch/arm/mach-omap2/include/mach/debug-macro.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/include/mach/debug-macro.S b/arch/arm/mach-omap2/include/mach/debug-macro.S index 13f98e59cfef..cdfc2a1f0e75 100644 --- a/arch/arm/mach-omap2/include/mach/debug-macro.S +++ b/arch/arm/mach-omap2/include/mach/debug-macro.S | |||
| @@ -66,11 +66,11 @@ omap_uart_lsr: .word 0 | |||
| 66 | beq 34f @ configure OMAP3UART4 | 66 | beq 34f @ configure OMAP3UART4 |
| 67 | cmp \rp, #OMAP4UART4 @ only on 44xx | 67 | cmp \rp, #OMAP4UART4 @ only on 44xx |
| 68 | beq 44f @ configure OMAP4UART4 | 68 | beq 44f @ configure OMAP4UART4 |
| 69 | cmp \rp, #TI816XUART1 @ ti816x UART offsets different | 69 | cmp \rp, #TI81XXUART1 @ ti81Xx UART offsets different |
| 70 | beq 81f @ configure UART1 | 70 | beq 81f @ configure UART1 |
| 71 | cmp \rp, #TI816XUART2 @ ti816x UART offsets different | 71 | cmp \rp, #TI81XXUART2 @ ti81Xx UART offsets different |
| 72 | beq 82f @ configure UART2 | 72 | beq 82f @ configure UART2 |
| 73 | cmp \rp, #TI816XUART3 @ ti816x UART offsets different | 73 | cmp \rp, #TI81XXUART3 @ ti81Xx UART offsets different |
| 74 | beq 83f @ configure UART3 | 74 | beq 83f @ configure UART3 |
| 75 | cmp \rp, #ZOOM_UART @ only on zoom2/3 | 75 | cmp \rp, #ZOOM_UART @ only on zoom2/3 |
| 76 | beq 95f @ configure ZOOM_UART | 76 | beq 95f @ configure ZOOM_UART |
| @@ -94,11 +94,11 @@ omap_uart_lsr: .word 0 | |||
| 94 | b 98f | 94 | b 98f |
| 95 | 44: mov \rp, #UART_OFFSET(OMAP4_UART4_BASE) | 95 | 44: mov \rp, #UART_OFFSET(OMAP4_UART4_BASE) |
| 96 | b 98f | 96 | b 98f |
| 97 | 81: mov \rp, #UART_OFFSET(TI816X_UART1_BASE) | 97 | 81: mov \rp, #UART_OFFSET(TI81XX_UART1_BASE) |
| 98 | b 98f | 98 | b 98f |
| 99 | 82: mov \rp, #UART_OFFSET(TI816X_UART2_BASE) | 99 | 82: mov \rp, #UART_OFFSET(TI81XX_UART2_BASE) |
| 100 | b 98f | 100 | b 98f |
| 101 | 83: mov \rp, #UART_OFFSET(TI816X_UART3_BASE) | 101 | 83: mov \rp, #UART_OFFSET(TI81XX_UART3_BASE) |
| 102 | b 98f | 102 | b 98f |
| 103 | 103 | ||
| 104 | 95: ldr \rp, =ZOOM_UART_BASE | 104 | 95: ldr \rp, =ZOOM_UART_BASE |