diff --git a/drivers/serial/uart_pl011.c b/drivers/serial/uart_pl011.c
index 3325568e93c..3e78253f44d 100644
--- a/drivers/serial/uart_pl011.c
+++ b/drivers/serial/uart_pl011.c
@@ -666,6 +666,16 @@ static void pl011_send(FAR struct uart_dev_s *dev, int ch)
   config->uart->dr = ch;
 }
 
+static void pl011_putc(struct uart_dev_s *dev, int ch)
+{
+  irqstate_t flags;
+
+  flags = spin_lock_irqsave(NULL);
+  while (!pl011_txempty(dev));
+  pl011_send(dev, ch);
+  spin_unlock_irqrestore(NULL, flags);
+}
+
 /***************************************************************************
  * Name: pl011_rxavailable
  *
@@ -986,6 +996,7 @@ static int pl011_setup(FAR struct uart_dev_s *dev)
     }
 
   up_irq_restore(i_flags);
+  pl011_enable(sport);
 
   return 0;
 }
@@ -1060,10 +1071,10 @@ int up_putc(int ch)
     {
       /* Add CR */
 
-      pl011_send(dev, '\r');
+      pl011_putc(dev, '\r');
     }
 
-  pl011_send(dev, ch);
+  pl011_putc(dev, ch);
 
   return ch;
 }