From: Stefano Babic Date: Thu, 30 Sep 2010 14:47:55 +0200 Subject: [U-Boot] [PATCH 05/10] MXC: Add watchdog support to serial driver In-Reply-To: <1285850880-13362-4-git-send-email-sbabic@denx.de> References: <1285850880-13362-1-git-send-email-sbabic@denx.de> <1285850880-13362-2-git-send-email-sbabic@denx.de> <1285850880-13362-3-git-send-email-sbabic@denx.de> <1285850880-13362-4-git-send-email-sbabic@denx.de> Message-ID: <1285850880-13362-5-git-send-email-sbabic@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Calls WATCHDOG_RESET() inside serial driver for boards enabling watchdog. Signed-off-by: Stefano Babic --- 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 +#include #ifdef CONFIG_MX31 #include #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') -- 1.6.3.3