V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

MXC: Add watchdog support to serial driver 

Calls WATCHDOG_RESET() inside serial driver
for boards enabling watchdog.

Signed-off-by: Stefano Babic <sbabic@denx.de>
This commit is contained in:
Stefano Babic 2010-08-18 10:22:42 +02:00
parent 9583dfab1d
commit 4ec3d2a745
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/serial/serial_mxc.c
View File

@ -18,6 +18,7 @@
*/ */
#include <common.h> #include <common.h>
#include <watchdog.h>
#ifdef CONFIG_MX31 #ifdef CONFIG_MX31
#include <asm/arch/mx31.h> #include <asm/arch/mx31.h>
#else #else
@ -189,7 +190,8 @@ void serial_setbrg (void)
int serial_getc (void) int serial_getc (void)
{ {
while (__REG(UART_PHYS + UTS) & UTS_RXEMPTY); while (__REG(UART_PHYS + UTS) & UTS_RXEMPTY)
WATCHDOG_RESET();
return (__REG(UART_PHYS + URXD) & URXD_RX_DATA); /* mask out status from upper word */ return (__REG(UART_PHYS + URXD) & URXD_RX_DATA); /* mask out status from upper word */
} }
@ -198,7 +200,8 @@ void serial_putc (const char c)
__REG(UART_PHYS + UTXD) = c; __REG(UART_PHYS + UTXD) = c;
/* wait for transmitter to be ready */ /* wait for transmitter to be ready */
while(!(__REG(UART_PHYS + UTS) & UTS_TXEMPTY)); while (!(__REG(UART_PHYS + UTS) & UTS_TXEMPTY))
WATCHDOG_RESET();
/* If \n, also do \r */ /* If \n, also do \r */
if (c == '\n') if (c == '\n')