arm: zynq: Move serial driver to driver model

Update this driver to use driver model and change all users.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index fa51d62559adcdf3515700572cd6ac7188470f3a..0d756cbc55a2afa4612195ec21dec48c4d835897 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -547,6 +547,7 @@ config ARCH_ZYNQ
        select DM
        select SPL_DM
        select DM_SPI
+       select DM_SERIAL
        select DM_SPI_FLASH
        select SPL_SEPARATE_BSS
 

diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index 926ba51dbb4790271e21cb7f382a451bc7bae6ad..88bebed23638c665d8b496889975f7ee2336717a 100644 (file)
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -6,6 +6,8 @@
  */
 
 #include <common.h>
+#include <debug_uart.h>
+#include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
 #include <watchdog.h>
@@ -18,6 +20,7 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 #define ZYNQ_UART_SR_TXFULL    0x00000010 /* TX FIFO full */
+#define ZYNQ_UART_SR_TXACTIVE  (1 << 11)  /* TX active */
 #define ZYNQ_UART_SR_RXEMPTY   0x00000002 /* RX FIFO empty */
 
 #define ZYNQ_UART_CR_TX_EN     0x00000010 /* TX enabled */
@@ -38,9 +41,8 @@ struct uart_zynq {
        u32 baud_rate_divider; /* 0x34 - Baud Rate Divider [7:0] */
 };
 
-static struct uart_zynq *uart_zynq_ports[2] = {
-       [0] = (struct uart_zynq *)ZYNQ_SERIAL_BASEADDR0,
-       [1] = (struct uart_zynq *)ZYNQ_SERIAL_BASEADDR1,
+struct zynq_uart_priv {
+       struct uart_zynq *regs;
 };
 
 /* Set up the baud rate in gd struct */
@@ -84,15 +86,6 @@ static void _uart_zynq_serial_setbrg(struct uart_zynq *regs,
        writel(bgen, &regs->baud_rate_gen);
 }
 
-/* Set up the baud rate in gd struct */
-static void uart_zynq_serial_setbrg(const int port)
-{
-       unsigned long clock = get_uart_clk(port);
-       struct uart_zynq *regs = uart_zynq_ports[port];
-
-       return _uart_zynq_serial_setbrg(regs, clock, gd->baudrate);
-}
-
 /* Initialize the UART, with...some settings. */
 static void _uart_zynq_serial_init(struct uart_zynq *regs)
 {
@@ -102,20 +95,6 @@ static void _uart_zynq_serial_init(struct uart_zynq *regs)
        writel(ZYNQ_UART_MR_PARITY_NONE, &regs->mode); /* 8 bit, no parity */
 }
 
-/* Initialize the UART, with...some settings. */
-static int uart_zynq_serial_init(const int port)
-{
-       struct uart_zynq *regs = uart_zynq_ports[port];
-
-       if (!regs)
-               return -1;
-
-       _uart_zynq_serial_init(regs);
-       uart_zynq_serial_setbrg(port);
-
-       return 0;
-}
-
 static int _uart_zynq_serial_putc(struct uart_zynq *regs, const char c)
 {
        if (readl(&regs->channel_sts) & ZYNQ_UART_SR_TXFULL)
@@ -126,103 +105,91 @@ static int _uart_zynq_serial_putc(struct uart_zynq *regs, const char c)
        return 0;
 }
 
-static void uart_zynq_serial_putc(const char c, const int port)
+int zynq_serial_setbrg(struct udevice *dev, int baudrate)
 {
-       struct uart_zynq *regs = uart_zynq_ports[port];
+       struct zynq_uart_priv *priv = dev_get_priv(dev);
+       unsigned long clock = get_uart_clk(0);
 
-       while (_uart_zynq_serial_putc(regs, c) == -EAGAIN)
-               WATCHDOG_RESET();
+       _uart_zynq_serial_setbrg(priv->regs, clock, baudrate);
 
-       if (c == '\n') {
-               while (_uart_zynq_serial_putc(regs, '\r') == -EAGAIN)
-                       WATCHDOG_RESET();
-       }
+       return 0;
 }
 
-static void uart_zynq_serial_puts(const char *s, const int port)
+static int zynq_serial_probe(struct udevice *dev)
 {
-       while (*s)
-               uart_zynq_serial_putc(*s++, port);
-}
+       struct zynq_uart_priv *priv = dev_get_priv(dev);
 
-static int uart_zynq_serial_tstc(const int port)
-{
-       struct uart_zynq *regs = uart_zynq_ports[port];
+       _uart_zynq_serial_init(priv->regs);
 
-       return (readl(&regs->channel_sts) & ZYNQ_UART_SR_RXEMPTY) == 0;
+       return 0;
 }
 
-static int uart_zynq_serial_getc(const int port)
+static int zynq_serial_getc(struct udevice *dev)
 {
-       struct uart_zynq *regs = uart_zynq_ports[port];
+       struct zynq_uart_priv *priv = dev_get_priv(dev);
+       struct uart_zynq *regs = priv->regs;
+
+       if (readl(&regs->channel_sts) & ZYNQ_UART_SR_RXEMPTY)
+               return -EAGAIN;
 
-       while (!uart_zynq_serial_tstc(port))
-               WATCHDOG_RESET();
        return readl(&regs->tx_rx_fifo);
 }
 
-/* Multi serial device functions */
-#define DECLARE_PSSERIAL_FUNCTIONS(port) \
-       static int uart_zynq##port##_init(void) \
-                               { return uart_zynq_serial_init(port); } \
-       static void uart_zynq##port##_setbrg(void) \
-                               { return uart_zynq_serial_setbrg(port); } \
-       static int uart_zynq##port##_getc(void) \
-                               { return uart_zynq_serial_getc(port); } \
-       static int uart_zynq##port##_tstc(void) \
-                               { return uart_zynq_serial_tstc(port); } \
-       static void uart_zynq##port##_putc(const char c) \
-                               { uart_zynq_serial_putc(c, port); } \
-       static void uart_zynq##port##_puts(const char *s) \
-                               { uart_zynq_serial_puts(s, port); }
-
-/* Serial device descriptor */
-#define INIT_PSSERIAL_STRUCTURE(port, __name) {        \
-         .name   = __name,                     \
-         .start  = uart_zynq##port##_init,     \
-         .stop   = NULL,                       \
-         .setbrg = uart_zynq##port##_setbrg,   \
-         .getc   = uart_zynq##port##_getc,     \
-         .tstc   = uart_zynq##port##_tstc,     \
-         .putc   = uart_zynq##port##_putc,     \
-         .puts   = uart_zynq##port##_puts,     \
-}
+static int zynq_serial_putc(struct udevice *dev, const char ch)
+{
+       struct zynq_uart_priv *priv = dev_get_priv(dev);
 
-DECLARE_PSSERIAL_FUNCTIONS(0);
-static struct serial_device uart_zynq_serial0_device =
-       INIT_PSSERIAL_STRUCTURE(0, "ttyPS0");
-DECLARE_PSSERIAL_FUNCTIONS(1);
-static struct serial_device uart_zynq_serial1_device =
-       INIT_PSSERIAL_STRUCTURE(1, "ttyPS1");
+       return _uart_zynq_serial_putc(priv->regs, ch);
+}
 
-__weak struct serial_device *default_serial_console(void)
+static int zynq_serial_pending(struct udevice *dev, bool input)
 {
-       const void *blob = gd->fdt_blob;
-       int node;
-       unsigned int base_addr;
+       struct zynq_uart_priv *priv = dev_get_priv(dev);
+       struct uart_zynq *regs = priv->regs;
 
-       node = fdt_path_offset(blob, "serial0");
-       if (node < 0)
-               return NULL;
+       if (input)
+               return !(readl(&regs->channel_sts) & ZYNQ_UART_SR_RXEMPTY);
+       else
+               return !!(readl(&regs->channel_sts) & ZYNQ_UART_SR_TXACTIVE);
+}
 
-       base_addr = fdtdec_get_addr(blob, node, "reg");
-       if (base_addr == FDT_ADDR_T_NONE)
-               return NULL;
+static int zynq_serial_ofdata_to_platdata(struct udevice *dev)
+{
+       struct zynq_uart_priv *priv = dev_get_priv(dev);
+       fdt_addr_t addr;
 
-       if (base_addr == ZYNQ_SERIAL_BASEADDR0)
-               return &uart_zynq_serial0_device;
+       addr = fdtdec_get_addr(gd->fdt_blob, dev->of_offset, "reg");
+       if (addr == FDT_ADDR_T_NONE)
+               return -EINVAL;
 
-       if (base_addr == ZYNQ_SERIAL_BASEADDR1)
-               return &uart_zynq_serial1_device;
+       priv->regs = (struct uart_zynq *)addr;
 
-       return NULL;
+       return 0;
 }
 
-void zynq_serial_initialize(void)
-{
-       serial_register(&uart_zynq_serial0_device);
-       serial_register(&uart_zynq_serial1_device);
-}
+static const struct dm_serial_ops zynq_serial_ops = {
+       .putc = zynq_serial_putc,
+       .pending = zynq_serial_pending,
+       .getc = zynq_serial_getc,
+       .setbrg = zynq_serial_setbrg,
+};
+
+static const struct udevice_id zynq_serial_ids[] = {
+       { .compatible = "xlnx,xuartps" },
+       { .compatible = "cdns,uart-r1p8" },
+       { }
+};
+
+U_BOOT_DRIVER(serial_s5p) = {
+       .name   = "serial_zynq",
+       .id     = UCLASS_SERIAL,
+       .of_match = zynq_serial_ids,
+       .ofdata_to_platdata = zynq_serial_ofdata_to_platdata,
+       .priv_auto_alloc_size = sizeof(struct zynq_uart_priv),
+       .probe = zynq_serial_probe,
+       .ops    = &zynq_serial_ops,
+       .flags = DM_FLAG_PRE_RELOC,
+};
 
 #ifdef CONFIG_DEBUG_UART_ZYNQ
 

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 32ee0fc149ff3f280ed27c2b7fde03aa00b61947..36c11009fc3dafc9a5616c827404ca6208e3ed54 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -55,9 +55,7 @@
 # define CONFIG_ARM_DCC
 # define CONFIG_CPU_ARMV8
 #else
-# if defined(CONFIG_ZYNQ_SERIAL_UART0) || defined(CONFIG_ZYNQ_SERIAL_UART1)
-#  define CONFIG_ZYNQ_SERIAL
-# endif
+# define CONFIG_ZYNQ_SERIAL
 #endif
 
 #define CONFIG_CONS_INDEX              0

diff --git a/include/configs/xilinx_zynqmp_ep.h b/include/configs/xilinx_zynqmp_ep.h
index e476eb1b496d22789af85f9648086196c8a357bb..ed6023a7bfabc55d789d5e83c0b2fb6e6d29fc70 100644 (file)
--- a/include/configs/xilinx_zynqmp_ep.h
+++ b/include/configs/xilinx_zynqmp_ep.h
@@ -18,7 +18,6 @@
 #define CONFIG_ZYNQ_GEM0
 #define CONFIG_ZYNQ_GEM_PHY_ADDR0      7
 
-#define CONFIG_ZYNQ_SERIAL_UART0
 #define CONFIG_ZYNQ_SDHCI0
 #define CONFIG_ZYNQ_I2C0
 #define CONFIG_SYS_I2C_ZYNQ

diff --git a/include/configs/zynq_microzed.h b/include/configs/zynq_microzed.h
index 549a664ef58e018c7bcc210766dfe41a072b7ac0..b5ffafb5616e9a9dd43449eea1949de4b16b380c 100644 (file)
--- a/include/configs/zynq_microzed.h
+++ b/include/configs/zynq_microzed.h
@@ -12,7 +12,6 @@
 
 #define CONFIG_SYS_SDRAM_SIZE          (1024 * 1024 * 1024)
 
-#define CONFIG_ZYNQ_SERIAL_UART1
 #define CONFIG_ZYNQ_GEM0
 #define CONFIG_ZYNQ_GEM_PHY_ADDR0      0
 

diff --git a/include/configs/zynq_picozed.h b/include/configs/zynq_picozed.h
index d116e05ac7da1250c8195c72e5af6e077d9f477b..ffc73bd0e316eb069309f94d6f80bad11bd459a7 100644 (file)
--- a/include/configs/zynq_picozed.h
+++ b/include/configs/zynq_picozed.h
@@ -12,7 +12,6 @@
 
 #define CONFIG_SYS_SDRAM_SIZE          (1024 * 1024 * 1024)
 
-#define CONFIG_ZYNQ_SERIAL_UART1
 #define CONFIG_ZYNQ_GEM0
 #define CONFIG_ZYNQ_GEM_PHY_ADDR0      0
 

diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index b6590547a9447efe5317523634a839cb5654d872..468a6bc7bf79fc212394cac7e1b75e3c83651358 100644 (file)
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -12,7 +12,6 @@
 
 #define CONFIG_SYS_SDRAM_SIZE          (1024 * 1024 * 1024)
 
-#define CONFIG_ZYNQ_SERIAL_UART1
 #define CONFIG_ZYNQ_GEM0
 #define CONFIG_ZYNQ_GEM_PHY_ADDR0      7
 

diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index 7a1b8729e5b17a83c8526ca553af2e54cddaacf9..63224dd74445e4a9addbfba2d85a6c73e97719b0 100644 (file)
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -15,26 +15,20 @@
 #define CONFIG_SYS_NO_FLASH
 
 #if defined(CONFIG_ZC770_XM010)
-# define CONFIG_ZYNQ_SERIAL_UART1
 # define CONFIG_ZYNQ_GEM0
 # define CONFIG_ZYNQ_GEM_PHY_ADDR0     7
 # define CONFIG_ZYNQ_SDHCI0
 # define CONFIG_ZYNQ_SPI
 
 #elif defined(CONFIG_ZC770_XM011)
-# define CONFIG_ZYNQ_SERIAL_UART1
 
 #elif defined(CONFIG_ZC770_XM012)
-# define CONFIG_ZYNQ_SERIAL_UART1
 # undef CONFIG_SYS_NO_FLASH
 
 #elif defined(CONFIG_ZC770_XM013)
-# define CONFIG_ZYNQ_SERIAL_UART0
 # define CONFIG_ZYNQ_GEM1
 # define CONFIG_ZYNQ_GEM_PHY_ADDR1     7
 
-#else
-# define CONFIG_ZYNQ_SERIAL_UART0
 #endif
 
 #include <configs/zynq-common.h>

diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index 946de953e4a755a0dd65f1d225142ff8f3310ab0..6ec6117f17db0d72e89e89be0f73dac31464a034 100644 (file)
--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@ -12,7 +12,6 @@
 
 #define CONFIG_SYS_SDRAM_SIZE          (512 * 1024 * 1024)
 
-#define CONFIG_ZYNQ_SERIAL_UART1
 #define CONFIG_ZYNQ_GEM0
 #define CONFIG_ZYNQ_GEM_PHY_ADDR0      0
 

diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
index 191f2a5f301e2f8a817cb01a803852a2eb6cff49..e2270cd2ea4f1558034e21276ed03af4ee0b5d84 100644 (file)
--- a/include/configs/zynq_zybo.h
+++ b/include/configs/zynq_zybo.h
@@ -13,7 +13,6 @@
 
 #define CONFIG_SYS_SDRAM_SIZE (512 * 1024 * 1024)
 
-#define CONFIG_ZYNQ_SERIAL_UART1
 #define CONFIG_ZYNQ_GEM0
 #define CONFIG_ZYNQ_GEM_PHY_ADDR0      0