Merge tag 'u-boot-amlogic-20211102' of https://source.denx.de/u-boot/custodians/u...

[platform/kernel/u-boot.git] / drivers / serial / serial_arc.c

diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c
index 7dbb49f..8f3e4dd 100644 (file)
--- a/drivers/serial/serial_arc.c
+++ b/drivers/serial/serial_arc.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <serial.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -25,7 +26,7 @@ struct arc_serial_regs {
 };
 
 
-struct arc_serial_platdata {
+struct arc_serial_plat {
        struct arc_serial_regs *reg;
        unsigned int uartclk;
 };
@@ -37,40 +38,21 @@ struct arc_serial_platdata {
 
 static int arc_serial_setbrg(struct udevice *dev, int baudrate)
 {
-       struct arc_serial_platdata *plat = dev->platdata;
+       struct arc_serial_plat *plat = dev_get_plat(dev);
        struct arc_serial_regs *const regs = plat->reg;
        int arc_console_baud = gd->cpu_clk / (baudrate * 4) - 1;
 
        writeb(arc_console_baud & 0xff, &regs->baudl);
-
-#ifdef CONFIG_ARC
-       /*
-        * UART ISS(Instruction Set simulator) emulation has a subtle bug:
-        * A existing value of Baudh = 0 is used as a indication to startup
-        * it's internal state machine.
-        * Thus if baudh is set to 0, 2 times, it chokes.
-        * This happens with BAUD=115200 and the formaula above
-        * Until that is fixed, when running on ISS, we will set baudh to !0
-        */
-       if (gd->arch.running_on_hw)
-               writeb((arc_console_baud & 0xff00) >> 8, &regs->baudh);
-       else
-               writeb(1, &regs->baudh);
-#else
        writeb((arc_console_baud & 0xff00) >> 8, &regs->baudh);
-#endif
 
        return 0;
 }
 
 static int arc_serial_putc(struct udevice *dev, const char c)
 {
-       struct arc_serial_platdata *plat = dev->platdata;
+       struct arc_serial_plat *plat = dev_get_plat(dev);
        struct arc_serial_regs *const regs = plat->reg;
 
-       if (c == '\n')
-               arc_serial_putc(dev, '\r');
-
        while (!(readb(&regs->status) & UART_TXEMPTY))
                ;
 
@@ -86,7 +68,7 @@ static int arc_serial_tstc(struct arc_serial_regs *const regs)
 
 static int arc_serial_pending(struct udevice *dev, bool input)
 {
-       struct arc_serial_platdata *plat = dev->platdata;
+       struct arc_serial_plat *plat = dev_get_plat(dev);
        struct arc_serial_regs *const regs = plat->reg;
        uint32_t status = readb(&regs->status);
 
@@ -98,7 +80,7 @@ static int arc_serial_pending(struct udevice *dev, bool input)
 
 static int arc_serial_getc(struct udevice *dev)
 {
-       struct arc_serial_platdata *plat = dev->platdata;
+       struct arc_serial_plat *plat = dev_get_plat(dev);
        struct arc_serial_regs *const regs = plat->reg;
 
        while (!arc_serial_tstc(regs))
@@ -128,13 +110,13 @@ static const struct udevice_id arc_serial_ids[] = {
        { }
 };
 
-static int arc_serial_ofdata_to_platdata(struct udevice *dev)
+static int arc_serial_of_to_plat(struct udevice *dev)
 {
-       struct arc_serial_platdata *plat = dev_get_platdata(dev);
+       struct arc_serial_plat *plat = dev_get_plat(dev);
        DECLARE_GLOBAL_DATA_PTR;
 
-       plat->reg = (struct arc_serial_regs *)dev_get_addr(dev);
-       plat->uartclk = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
+       plat->reg = dev_read_addr_ptr(dev);
+       plat->uartclk = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
                                       "clock-frequency", 0);
 
        return 0;
@@ -144,8 +126,34 @@ U_BOOT_DRIVER(serial_arc) = {
        .name   = "serial_arc",
        .id     = UCLASS_SERIAL,
        .of_match = arc_serial_ids,
-       .ofdata_to_platdata = arc_serial_ofdata_to_platdata,
+       .of_to_plat = arc_serial_of_to_plat,
+       .plat_auto      = sizeof(struct arc_serial_plat),
        .probe = arc_serial_probe,
        .ops    = &arc_serial_ops,
-       .flags = DM_FLAG_PRE_RELOC,
 };
+
+#ifdef CONFIG_DEBUG_ARC_SERIAL
+#include <debug_uart.h>
+
+static inline void _debug_uart_init(void)
+{
+       struct arc_serial_regs *regs = (struct arc_serial_regs *)CONFIG_DEBUG_UART_BASE;
+       int arc_console_baud = CONFIG_DEBUG_UART_CLOCK / (CONFIG_BAUDRATE * 4) - 1;
+
+       writeb(arc_console_baud & 0xff, &regs->baudl);
+       writeb((arc_console_baud & 0xff00) >> 8, &regs->baudh);
+}
+
+static inline void _debug_uart_putc(int c)
+{
+       struct arc_serial_regs *regs = (struct arc_serial_regs *)CONFIG_DEBUG_UART_BASE;
+
+       while (!(readb(&regs->status) & UART_TXEMPTY))
+               ;
+
+       writeb(c, &regs->data);
+}
+
+DEBUG_UART_FUNCS
+
+#endif