serial: lpc32xx hsuart: port driver to driver model

The change ports NXP LPC32xx 14-clock UART device driver to driver
model.

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/serial/lpc32xx_hsuart.c b/drivers/serial/lpc32xx_hsuart.c
index c8926a8945ac6c84e81ff651a18ed0b2eb8566ef..b42537529de85c10e44c522e2a5775523473e0cb 100644 (file)
--- a/drivers/serial/lpc32xx_hsuart.c
+++ b/drivers/serial/lpc32xx_hsuart.c
@@ -1,89 +1,114 @@
 /*
- * Copyright (C) 2011 Vladimir Zapolskiy <vz@mleia.com>
+ * Copyright (C) 2011-2015 Vladimir Zapolskiy <vz@mleia.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/clk.h>
-#include <asm/arch/uart.h>
-#include <asm/io.h>
+#include <dm.h>
 #include <serial.h>
+#include <dm/platform_data/lpc32xx_hsuart.h>
+
+#include <asm/arch/uart.h>
 #include <linux/compiler.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static struct hsuart_regs *hsuart = (struct hsuart_regs *)HS_UART_BASE;
+struct lpc32xx_hsuart_priv {
+       struct hsuart_regs *hsuart;
+};
 
-static void lpc32xx_serial_setbrg(void)
+static int lpc32xx_serial_setbrg(struct udevice *dev, int baudrate)
 {
+       struct lpc32xx_hsuart_priv *priv = dev_get_priv(dev);
+       struct hsuart_regs *hsuart = priv->hsuart;
        u32 div;
 
        /* UART rate = PERIPH_CLK / ((HSU_RATE + 1) x 14) */
-       div = (get_serial_clock() / 14 + gd->baudrate / 2) / gd->baudrate - 1;
+       div = (get_serial_clock() / 14 + baudrate / 2) / baudrate - 1;
        if (div > 255)
                div = 255;
 
        writel(div, &hsuart->rate);
+
+       return 0;
 }
 
-static int lpc32xx_serial_getc(void)
+static int lpc32xx_serial_getc(struct udevice *dev)
 {
-       while (!(readl(&hsuart->level) & HSUART_LEVEL_RX))
-               /* NOP */;
+       struct lpc32xx_hsuart_priv *priv = dev_get_priv(dev);
+       struct hsuart_regs *hsuart = priv->hsuart;
+
+       if (!(readl(&hsuart->level) & HSUART_LEVEL_RX))
+               return -EAGAIN;
 
        return readl(&hsuart->rx) & HSUART_RX_DATA;
 }
 
-static void lpc32xx_serial_putc(const char c)
+static int lpc32xx_serial_putc(struct udevice *dev, const char c)
 {
-       if (c == '\n')
-               serial_putc('\r');
+       struct lpc32xx_hsuart_priv *priv = dev_get_priv(dev);
+       struct hsuart_regs *hsuart = priv->hsuart;
+
+       /* Wait for empty FIFO */
+       if (readl(&hsuart->level) & HSUART_LEVEL_TX)
+               return -EAGAIN;
 
        writel(c, &hsuart->tx);
 
-       /* Wait for character to be sent */
-       while (readl(&hsuart->level) & HSUART_LEVEL_TX)
-               /* NOP */;
+       return 0;
 }
 
-static int lpc32xx_serial_tstc(void)
+static int lpc32xx_serial_pending(struct udevice *dev, bool input)
 {
-       if (readl(&hsuart->level) & HSUART_LEVEL_RX)
-               return 1;
+       struct lpc32xx_hsuart_priv *priv = dev_get_priv(dev);
+       struct hsuart_regs *hsuart = priv->hsuart;
+
+       if (input) {
+               if (readl(&hsuart->level) & HSUART_LEVEL_RX)
+                       return 1;
+       } else {
+               if (readl(&hsuart->level) & HSUART_LEVEL_TX)
+                       return 1;
+       }
 
        return 0;
 }
 
-static int lpc32xx_serial_init(void)
+static int lpc32xx_serial_init(struct hsuart_regs *hsuart)
 {
-       lpc32xx_serial_setbrg();
-
        /* Disable hardware RTS and CTS flow control, set up RX and TX FIFO */
        writel(HSUART_CTRL_TMO_16 | HSUART_CTRL_HSU_OFFSET(20) |
               HSUART_CTRL_HSU_RX_TRIG_32 | HSUART_CTRL_HSU_TX_TRIG_0,
               &hsuart->ctrl);
+
        return 0;
 }
 
-static struct serial_device lpc32xx_serial_drv = {
-       .name   = "lpc32xx_serial",
-       .start  = lpc32xx_serial_init,
-       .stop   = NULL,
+static int lpc32xx_hsuart_probe(struct udevice *dev)
+{
+       struct lpc32xx_hsuart_platdata *platdata = dev_get_platdata(dev);
+       struct lpc32xx_hsuart_priv *priv = dev_get_priv(dev);
+
+       priv->hsuart = (struct hsuart_regs *)platdata->base;
+
+       lpc32xx_serial_init(priv->hsuart);
+
+       return 0;
+}
+
+static const struct dm_serial_ops lpc32xx_hsuart_ops = {
        .setbrg = lpc32xx_serial_setbrg,
-       .putc   = lpc32xx_serial_putc,
-       .puts   = default_serial_puts,
        .getc   = lpc32xx_serial_getc,
-       .tstc   = lpc32xx_serial_tstc,
+       .putc   = lpc32xx_serial_putc,
+       .pending = lpc32xx_serial_pending,
 };
 
-void lpc32xx_serial_initialize(void)
-{
-       serial_register(&lpc32xx_serial_drv);
-}
-
-__weak struct serial_device *default_serial_console(void)
-{
-       return &lpc32xx_serial_drv;
-}
+U_BOOT_DRIVER(lpc32xx_hsuart) = {
+       .name   = "lpc32xx_hsuart",
+       .id     = UCLASS_SERIAL,
+       .probe  = lpc32xx_hsuart_probe,
+       .ops    = &lpc32xx_hsuart_ops,
+       .priv_auto_alloc_size = sizeof(struct lpc32xx_hsuart_priv),
+       .flags  = DM_FLAG_PRE_RELOC,
+};

diff --git a/include/dm/platform_data/lpc32xx_hsuart.h b/include/dm/platform_data/lpc32xx_hsuart.h
new file mode 100644 (file)
index 0000000..fd191b5
--- /dev/null
+++ b/include/dm/platform_data/lpc32xx_hsuart.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2015 Vladimir Zapolskiy <vz@mleia.com>
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef _LPC32XX_HSUART_PLAT_H
+#define _LPC32XX_HSUART_PLAT_H
+
+/**
+ * struct lpc32xx_hsuart_platdata - NXP LPC32xx HSUART platform data
+ *
+ * @base:               Base register address
+ */
+struct lpc32xx_hsuart_platdata {
+       unsigned long base;
+};
+
+#endif