Merge branch 'master' of git://git.denx.de/u-boot-sh

[karo-tx-uboot.git] / drivers / serial / serial_uniphier.c

diff --git a/drivers/serial/serial_uniphier.c b/drivers/serial/serial_uniphier.c
index 9114b3ed6002a1a0d9e3c6303ad07993060b07f9..6046efb51fe87b8711bf7e4c13e007ead20e3647 100644 (file)
--- a/drivers/serial/serial_uniphier.c
+++ b/drivers/serial/serial_uniphier.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include <common.h>
+#include <linux/serial_reg.h>
 #include <asm/io.h>
 #include <asm/errno.h>
 #include <dm/device.h>
@@ -37,17 +37,6 @@ struct uniphier_serial {
 
 #define thr rbr
 
-/*
- * These are the definitions for the Line Control Register
- */
-#define UART_LCR_WLS_8 0x03            /* 8 bit character length */
-
-/*
- * These are the definitions for the Line Status Register
- */
-#define UART_LSR_DR    0x01            /* Data ready */
-#define UART_LSR_THRE  0x20            /* Xmit holding register empty */
-
 struct uniphier_serial_private_data {
        struct uniphier_serial __iomem *membase;
 };
@@ -55,14 +44,14 @@ struct uniphier_serial_private_data {
 #define uniphier_serial_port(dev)      \
        ((struct uniphier_serial_private_data *)dev_get_priv(dev))->membase
 
-int uniphier_serial_setbrg(struct udevice *dev, int baudrate)
+static int uniphier_serial_setbrg(struct udevice *dev, int baudrate)
 {
        struct uniphier_serial_platform_data *plat = dev_get_platdata(dev);
        struct uniphier_serial __iomem *port = uniphier_serial_port(dev);
        const unsigned int mode_x_div = 16;
        unsigned int divisor;
 
-       writeb(UART_LCR_WLS_8, &port->lcr);
+       writeb(UART_LCR_WLEN8, &port->lcr);
 
        divisor = DIV_ROUND_CLOSEST(plat->uartclk, mode_x_div * baudrate);
 
@@ -93,7 +82,17 @@ static int uniphier_serial_putc(struct udevice *dev, const char c)
        return 0;
 }
 
-int uniphier_serial_probe(struct udevice *dev)
+static int uniphier_serial_pending(struct udevice *dev, bool input)
+{
+       struct uniphier_serial __iomem *port = uniphier_serial_port(dev);
+
+       if (input)
+               return readb(&port->lsr) & UART_LSR_DR;
+       else
+               return !(readb(&port->lsr) & UART_LSR_THRE);
+}
+
+static int uniphier_serial_probe(struct udevice *dev)
 {
        struct uniphier_serial_private_data *priv = dev_get_priv(dev);
        struct uniphier_serial_platform_data *plat = dev_get_platdata(dev);
@@ -106,7 +105,7 @@ int uniphier_serial_probe(struct udevice *dev)
        return 0;
 }
 
-int uniphier_serial_remove(struct udevice *dev)
+static int uniphier_serial_remove(struct udevice *dev)
 {
        unmap_sysmem(uniphier_serial_port(dev));
 
@@ -134,6 +133,7 @@ static const struct dm_serial_ops uniphier_serial_ops = {
        .setbrg = uniphier_serial_setbrg,
        .getc = uniphier_serial_getc,
        .putc = uniphier_serial_putc,
+       .pending = uniphier_serial_pending,
 };
 
 U_BOOT_DRIVER(uniphier_serial) = {