diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-11 08:19:04 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-11 08:19:04 (GMT) |
| commit | e67f46286440a53fb1d693152667ea3b1a6b3060 (patch) | |
| tree | 3fdedda3a9122785e07e209ab6a5a0fc7fd65fd7 /drivers/serial | |
| parent | bfc7bea6adc46e1db2f5a5e3464d7652ed67c864 (diff) | |
| parent | f8f8acd7249d224ed5f9704a5738c469b137bc8e (diff) | |
| download | u-boot-fsl-qoriq-e67f46286440a53fb1d693152667ea3b1a6b3060.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-imx
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/serial_mxc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c index 4b93e7b..f96b21f 100644 --- a/drivers/serial/serial_mxc.c +++ b/drivers/serial/serial_mxc.c @@ -18,6 +18,7 @@ */ #include <common.h> +#include <watchdog.h> #ifdef CONFIG_MX31 #include <asm/arch/mx31.h> #else @@ -189,7 +190,8 @@ void serial_setbrg (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 */ } @@ -198,7 +200,8 @@ void serial_putc (const char c) __REG(UART_PHYS + UTXD) = c; /* 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 (c == '\n') |