spi: fsl_dspi: Drop nondm code

[oweals/u-boot.git] / drivers / serial / serial_mpc8xx.c

diff --git a/drivers/serial/serial_mpc8xx.c b/drivers/serial/serial_mpc8xx.c
index 7a5908f46455da214fae49555f0c07830c4b5099..50d6e70f17735c0af598ef24e2b9998b3c31dd56 100644 (file)
--- a/drivers/serial/serial_mpc8xx.c
+++ b/drivers/serial/serial_mpc8xx.c
@@ -1,12 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <command.h>
+#include <dm.h>
 #include <serial.h>
 #include <watchdog.h>
 #include <asm/cpm_8xx.h>
@@ -36,9 +36,9 @@ struct serialbuffer {
        uchar   txbuf;  /* tx buffers */
 };
 
-static void serial_setdivisor(cpm8xx_t __iomem *cp)
+static void serial_setdivisor(cpm8xx_t __iomem *cp, int baudrate)
 {
-       int divisor = (gd->cpu_clk + 8 * gd->baudrate) / 16 / gd->baudrate;
+       int divisor = (gd->cpu_clk + 8 * baudrate) / 16 / baudrate;
 
        if (divisor / 16 > 0x1000) {
                /* bad divisor, assume 50MHz clock and 9600 baud */
@@ -59,7 +59,7 @@ static void serial_setdivisor(cpm8xx_t __iomem *cp)
  * as serial console interface.
  */
 
-static void smc_setbrg(void)
+static int serial_mpc8xx_setbrg(struct udevice *dev, int baudrate)
 {
        immap_t __iomem *im = (immap_t __iomem *)CONFIG_SYS_IMMR;
        cpm8xx_t __iomem *cp = &(im->im_cpm);
@@ -72,10 +72,12 @@ static void smc_setbrg(void)
 
        out_be32(&cp->cp_simode, 0);
 
-       serial_setdivisor(cp);
+       serial_setdivisor(cp, baudrate);
+
+       return 0;
 }
 
-static int smc_init(void)
+static int serial_mpc8xx_probe(struct udevice *dev)
 {
        immap_t __iomem *im = (immap_t __iomem *)CONFIG_SYS_IMMR;
        smc_t __iomem *sp;
@@ -140,7 +142,7 @@ static int smc_init(void)
        out_8(&sp->smc_smce, 0xff);
 
        /* Set up the baud rate generator */
-       smc_setbrg();
+       serial_mpc8xx_setbrg(dev, gd->baudrate);
 
        /* Make the first buffer the only buffer. */
        setbits_be16(&rtx->txbd.cbd_sc, BD_SC_WRAP);
@@ -167,14 +169,14 @@ static int smc_init(void)
        return 0;
 }
 
-static void smc_putc(const char c)
+static int serial_mpc8xx_putc(struct udevice *dev, const char c)
 {
        immap_t __iomem *im = (immap_t __iomem *)CONFIG_SYS_IMMR;
        cpm8xx_t        __iomem *cpmp = &(im->im_cpm);
        struct serialbuffer     __iomem *rtx;
 
        if (c == '\n')
-               smc_putc('\r');
+               serial_mpc8xx_putc(dev, '\r');
 
        rtx = (struct serialbuffer __iomem *)&cpmp->cp_dpmem[CPM_SERIAL_BASE];
 
@@ -185,15 +187,11 @@ static void smc_putc(const char c)
 
        while (in_be16(&rtx->txbd.cbd_sc) & BD_SC_READY)
                WATCHDOG_RESET();
-}
 
-static void smc_puts(const char *s)
-{
-       while (*s)
-               smc_putc(*s++);
+       return 0;
 }
 
-static int smc_getc(void)
+static int serial_mpc8xx_getc(struct udevice *dev)
 {
        immap_t __iomem *im = (immap_t __iomem *)CONFIG_SYS_IMMR;
        cpm8xx_t        __iomem *cpmp = &(im->im_cpm);
@@ -223,34 +221,37 @@ static int smc_getc(void)
        return c;
 }
 
-static int smc_tstc(void)
+static int serial_mpc8xx_pending(struct udevice *dev, bool input)
 {
        immap_t __iomem *im = (immap_t __iomem *)CONFIG_SYS_IMMR;
        cpm8xx_t        __iomem *cpmp = &(im->im_cpm);
        struct serialbuffer     __iomem *rtx;
 
+       if (!input)
+               return 0;
+
        rtx = (struct serialbuffer __iomem *)&cpmp->cp_dpmem[CPM_SERIAL_BASE];
 
        return !(in_be16(&rtx->rxbd.cbd_sc) & BD_SC_EMPTY);
 }
 
-struct serial_device serial_smc_device = {
-       .name   = "serial_smc",
-       .start  = smc_init,
-       .stop   = NULL,
-       .setbrg = smc_setbrg,
-       .getc   = smc_getc,
-       .tstc   = smc_tstc,
-       .putc   = smc_putc,
-       .puts   = smc_puts,
+static const struct dm_serial_ops serial_mpc8xx_ops = {
+       .putc = serial_mpc8xx_putc,
+       .pending = serial_mpc8xx_pending,
+       .getc = serial_mpc8xx_getc,
+       .setbrg = serial_mpc8xx_setbrg,
 };
 
-__weak struct serial_device *default_serial_console(void)
-{
-       return &serial_smc_device;
-}
+static const struct udevice_id serial_mpc8xx_ids[] = {
+       { .compatible = "fsl,pq1-smc" },
+       { }
+};
 
-void mpc8xx_serial_initialize(void)
-{
-       serial_register(&serial_smc_device);
-}
+U_BOOT_DRIVER(serial_mpc8xx) = {
+       .name   = "serial_mpc8xx",
+       .id     = UCLASS_SERIAL,
+       .of_match = serial_mpc8xx_ids,
+       .probe = serial_mpc8xx_probe,
+       .ops    = &serial_mpc8xx_ops,
+       .flags = DM_FLAG_PRE_RELOC,
+};