Message ID | 1452742746-31746-6-git-send-email-bmeng.cn@gmail.com |
---|---|
State | Accepted |
Delegated to: | Simon Glass |
Headers | show |
On 13 January 2016 at 20:39, Bin Meng <bmeng.cn@gmail.com> wrote: > There is no need to go through serial driver subsystem, instead > call the driver's setbrg and putc routines directly. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v2: None > > drivers/serial/serial_lpuart.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Acked-by: Simon Glass <sjg@chromium.org>
On 20 January 2016 at 13:27, Simon Glass <sjg@chromium.org> wrote: > On 13 January 2016 at 20:39, Bin Meng <bmeng.cn@gmail.com> wrote: >> There is no need to go through serial driver subsystem, instead >> call the driver's setbrg and putc routines directly. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> Reviewed-by: Simon Glass <sjg@chromium.org> >> --- >> >> Changes in v2: None >> >> drivers/serial/serial_lpuart.c | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-dm, thanks!
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index ae47183..0c0ab87 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -78,7 +78,7 @@ static int lpuart_serial_getc(void) static void lpuart_serial_putc(const char c) { if (c == '\n') - serial_putc('\r'); + lpuart_serial_putc('\r'); while (!(__raw_readb(&base->us1) & US1_TDRE)) WATCHDOG_RESET(); @@ -118,7 +118,7 @@ static int lpuart_serial_init(void) __raw_writeb(CFIFO_TXFLUSH | CFIFO_RXFLUSH, &base->ucfifo); /* provide data bits, parity, stop bit, etc */ - serial_setbrg(); + lpuart_serial_setbrg(); __raw_writeb(UC2_RE | UC2_TE, &base->uc2); @@ -165,7 +165,7 @@ static int lpuart32_serial_getc(void) static void lpuart32_serial_putc(const char c) { if (c == '\n') - serial_putc('\r'); + lpuart32_serial_putc('\r'); while (!(in_be32(&base->stat) & STAT_TDRE)) WATCHDOG_RESET(); @@ -201,7 +201,7 @@ static int lpuart32_serial_init(void) out_be32(&base->match, 0); /* provide data bits, parity, stop bit, etc */ - serial_setbrg(); + lpuart32_serial_setbrg(); out_be32(&base->ctrl, CTRL_RE | CTRL_TE);