Merge changes from topic "console_t_drvdata_fix" into integration
* changes: imx: console: Use CONSOLE_T_BASE for UART base address Tegra: spe: use CONSOLE_T_BASE to save MMIO base address
This commit is contained in:
commit
ac56d00838
|
@ -20,7 +20,7 @@ func console_imx_uart_register
|
|||
mov r4, r3
|
||||
cmp r4, #0
|
||||
beq register_fail
|
||||
str r0, [r4, #CONSOLE_T_DRVDATA]
|
||||
str r0, [r4, #CONSOLE_T_BASE]
|
||||
|
||||
bl console_imx_uart_core_init
|
||||
cmp r0, #0
|
||||
|
@ -35,16 +35,16 @@ register_fail:
|
|||
endfunc console_imx_uart_register
|
||||
|
||||
func console_imx_uart_putc
|
||||
ldr r1, [r1, #CONSOLE_T_DRVDATA]
|
||||
ldr r1, [r1, #CONSOLE_T_BASE]
|
||||
b console_imx_uart_core_putc
|
||||
endfunc console_imx_uart_putc
|
||||
|
||||
func console_imx_uart_getc
|
||||
ldr r0, [r0, #CONSOLE_T_DRVDATA]
|
||||
ldr r0, [r0, #CONSOLE_T_BASE]
|
||||
b console_imx_uart_core_getc
|
||||
endfunc console_imx_uart_getc
|
||||
|
||||
func console_imx_uart_flush
|
||||
ldr r0, [r0, #CONSOLE_T_DRVDATA]
|
||||
ldr r0, [r0, #CONSOLE_T_BASE]
|
||||
b console_imx_uart_core_flush
|
||||
endfunc console_imx_uart_flush
|
||||
|
|
|
@ -25,7 +25,7 @@ func console_imx_uart_register
|
|||
mov x7, x30
|
||||
mov x6, x3
|
||||
cbz x6, register_fail
|
||||
str x0, [x6, #CONSOLE_T_DRVDATA]
|
||||
str x0, [x6, #CONSOLE_T_BASE]
|
||||
|
||||
bl console_imx_uart_init
|
||||
cbz x0, register_fail
|
||||
|
@ -44,7 +44,7 @@ func console_imx_uart_init
|
|||
endfunc console_imx_uart_init
|
||||
|
||||
func console_imx_uart_putc
|
||||
ldr x1, [x1, #CONSOLE_T_DRVDATA]
|
||||
ldr x1, [x1, #CONSOLE_T_BASE]
|
||||
cbz x1, putc_error
|
||||
|
||||
/* Prepare '\r' to '\n' */
|
||||
|
@ -68,7 +68,7 @@ putc_error:
|
|||
endfunc console_imx_uart_putc
|
||||
|
||||
func console_imx_uart_getc
|
||||
ldr x0, [x0, #CONSOLE_T_DRVDATA]
|
||||
ldr x0, [x0, #CONSOLE_T_BASE]
|
||||
cbz x0, getc_error
|
||||
1:
|
||||
ldr w1, [x0, #UTS]
|
||||
|
|
|
@ -20,7 +20,7 @@ func console_lpuart_register
|
|||
mov x7, x30
|
||||
mov x6, x3
|
||||
cbz x6, register_fail
|
||||
str x0, [x6, #CONSOLE_T_DRVDATA]
|
||||
str x0, [x6, #CONSOLE_T_BASE]
|
||||
|
||||
bl console_lpuart_init
|
||||
cbz x0, register_fail
|
||||
|
@ -39,7 +39,7 @@ func console_lpuart_init
|
|||
endfunc console_lpuart_init
|
||||
|
||||
func console_lpuart_putc
|
||||
ldr x1, [x1, #CONSOLE_T_DRVDATA]
|
||||
ldr x1, [x1, #CONSOLE_T_BASE]
|
||||
cbz x1, putc_error
|
||||
/* Prepare '\r' to '\n' */
|
||||
cmp w0, #0xA
|
||||
|
@ -62,7 +62,7 @@ putc_error:
|
|||
endfunc console_lpuart_putc
|
||||
|
||||
func console_lpuart_getc
|
||||
ldr x0, [x0, #CONSOLE_T_DRVDATA]
|
||||
ldr x0, [x0, #CONSOLE_T_BASE]
|
||||
cbz x0, getc_error
|
||||
/* Check if the receive FIFO state */
|
||||
ret
|
||||
|
|
|
@ -69,7 +69,7 @@ func console_spe_register
|
|||
check_if_console_is_ready x0, x1, x2, register_fail
|
||||
|
||||
cbz x3, register_fail
|
||||
str x0, [x3, #CONSOLE_T_DRVDATA]
|
||||
str x0, [x3, #CONSOLE_T_BASE]
|
||||
mov x0, x3
|
||||
finish_console_register spe putc=1, getc=1, flush=1
|
||||
|
||||
|
@ -132,7 +132,7 @@ endfunc console_spe_core_putc
|
|||
* --------------------------------------------------------
|
||||
*/
|
||||
func console_spe_putc
|
||||
ldr x1, [x1, #CONSOLE_T_DRVDATA]
|
||||
ldr x1, [x1, #CONSOLE_T_BASE]
|
||||
b console_spe_core_putc
|
||||
endfunc console_spe_putc
|
||||
|
||||
|
@ -183,6 +183,6 @@ endfunc console_spe_core_flush
|
|||
* ---------------------------------------------
|
||||
*/
|
||||
func console_spe_flush
|
||||
ldr x0, [x0, #CONSOLE_T_DRVDATA]
|
||||
ldr x0, [x0, #CONSOLE_T_BASE]
|
||||
b console_spe_core_flush
|
||||
endfunc console_spe_flush
|
||||
|
|
Loading…
Reference in New Issue