gpio: atmel_pio4: give a full configuration when muxing pins

[u-boot] / drivers / serial / serial-uclass.c

diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 7e4290684c5e41384f35601006b9764dfe930df5..321d23ee93bf5c8d909e2309742eac28eb776671 100644 (file)
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2014 The Chromium OS Authors.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -14,6 +13,7 @@
 #include <watchdog.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
+#include <dm/of_access.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -22,8 +22,8 @@ DECLARE_GLOBAL_DATA_PTR;
  */
 static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE;
 
-#ifndef CONFIG_SYS_MALLOC_F_LEN
-#error "Serial is required before relocation - define CONFIG_SYS_MALLOC_F_LEN to make this work"
+#if !CONFIG_VAL(SYS_MALLOC_F_LEN)
+#error "Serial is required before relocation - define CONFIG_$(SPL_)SYS_MALLOC_F_LEN to make this work"
 #endif
 
 static int serial_check_stdout(const void *blob, struct udevice **devp)
@@ -73,6 +73,9 @@ static void serial_find_console_or_panic(void)
 {
        const void *blob = gd->fdt_blob;
        struct udevice *dev;
+#ifdef CONFIG_SERIAL_SEARCH_ALL
+       int ret;
+#endif
 
        if (CONFIG_IS_ENABLED(OF_PLATDATA)) {
                uclass_first_device(UCLASS_SERIAL, &dev);
@@ -81,9 +84,20 @@ static void serial_find_console_or_panic(void)
                        return;
                }
        } else if (CONFIG_IS_ENABLED(OF_CONTROL) && blob) {
-               if (!serial_check_stdout(blob, &dev)) {
-                       gd->cur_serial_dev = dev;
-                       return;
+               /* Live tree has support for stdout */
+               if (of_live_active()) {
+                       struct device_node *np = of_get_stdout();
+
+                       if (np && !uclass_get_device_by_ofnode(UCLASS_SERIAL,
+                                       np_to_ofnode(np), &dev)) {
+                               gd->cur_serial_dev = dev;
+                               return;
+                       }
+               } else {
+                       if (!serial_check_stdout(blob, &dev)) {
+                               gd->cur_serial_dev = dev;
+                               return;
+                       }
                }
        }
        if (!SPL_BUILD || !CONFIG_IS_ENABLED(OF_CONTROL) || !blob) {
@@ -92,20 +106,43 @@ static void serial_find_console_or_panic(void)
                 * from 1!).
                 *
                 * Failing that, get the device with sequence number 0, or in
-                * extremis just the first serial device we can find. But we
-                * insist on having a console (even if it is silent).
+                * extremis just the first working serial device we can find.
+                * But we insist on having a console (even if it is silent).
                 */
 #ifdef CONFIG_CONS_INDEX
 #define INDEX (CONFIG_CONS_INDEX - 1)
 #else
 #define INDEX 0
 #endif
+
+#ifdef CONFIG_SERIAL_SEARCH_ALL
+               if (!uclass_get_device_by_seq(UCLASS_SERIAL, INDEX, &dev) ||
+                   !uclass_get_device(UCLASS_SERIAL, INDEX, &dev)) {
+                       if (dev->flags & DM_FLAG_ACTIVATED) {
+                               gd->cur_serial_dev = dev;
+                               return;
+                       }
+               }
+
+               /* Search for any working device */
+               for (ret = uclass_first_device_check(UCLASS_SERIAL, &dev);
+                    dev;
+                    ret = uclass_next_device_check(&dev)) {
+                       if (!ret) {
+                               /* Device did succeed probing */
+                               gd->cur_serial_dev = dev;
+                               return;
+                       }
+               }
+#else
                if (!uclass_get_device_by_seq(UCLASS_SERIAL, INDEX, &dev) ||
                    !uclass_get_device(UCLASS_SERIAL, INDEX, &dev) ||
                    (!uclass_first_device(UCLASS_SERIAL, &dev) && dev)) {
                        gd->cur_serial_dev = dev;
                        return;
                }
+#endif
+
 #undef INDEX
        }
 
@@ -148,7 +185,7 @@ static void _serial_puts(struct udevice *dev, const char *str)
                _serial_putc(dev, *str++);
 }
 
-static int _serial_getc(struct udevice *dev)
+static int __serial_getc(struct udevice *dev)
 {
        struct dm_serial_ops *ops = serial_get_ops(dev);
        int err;
@@ -162,7 +199,7 @@ static int _serial_getc(struct udevice *dev)
        return err >= 0 ? err : 0;
 }
 
-static int _serial_tstc(struct udevice *dev)
+static int __serial_tstc(struct udevice *dev)
 {
        struct dm_serial_ops *ops = serial_get_ops(dev);
 
@@ -172,6 +209,44 @@ static int _serial_tstc(struct udevice *dev)
        return 1;
 }
 
+#if CONFIG_IS_ENABLED(SERIAL_RX_BUFFER)
+static int _serial_tstc(struct udevice *dev)
+{
+       struct serial_dev_priv *upriv = dev_get_uclass_priv(dev);
+
+       /* Read all available chars into the RX buffer */
+       while (__serial_tstc(dev)) {
+               upriv->buf[upriv->wr_ptr++] = __serial_getc(dev);
+               upriv->wr_ptr %= CONFIG_SERIAL_RX_BUFFER_SIZE;
+       }
+
+       return upriv->rd_ptr != upriv->wr_ptr ? 1 : 0;
+}
+
+static int _serial_getc(struct udevice *dev)
+{
+       struct serial_dev_priv *upriv = dev_get_uclass_priv(dev);
+       char val;
+
+       val = upriv->buf[upriv->rd_ptr++];
+       upriv->rd_ptr %= CONFIG_SERIAL_RX_BUFFER_SIZE;
+
+       return val;
+}
+
+#else /* CONFIG_IS_ENABLED(SERIAL_RX_BUFFER) */
+
+static int _serial_getc(struct udevice *dev)
+{
+       return __serial_getc(dev);
+}
+
+static int _serial_tstc(struct udevice *dev)
+{
+       return __serial_tstc(dev);
+}
+#endif /* CONFIG_IS_ENABLED(SERIAL_RX_BUFFER) */
+
 void serial_putc(char ch)
 {
        if (gd->cur_serial_dev)
@@ -341,12 +416,18 @@ static int serial_post_probe(struct udevice *dev)
        memset(&sdev, '\0', sizeof(sdev));
 
        strncpy(sdev.name, dev->name, sizeof(sdev.name));
-       sdev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
+       sdev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_DM;
        sdev.priv = dev;
        sdev.putc = serial_stub_putc;
        sdev.puts = serial_stub_puts;
        sdev.getc = serial_stub_getc;
        sdev.tstc = serial_stub_tstc;
+
+#if CONFIG_IS_ENABLED(SERIAL_RX_BUFFER)
+       /* Allocate the RX buffer */
+       upriv->buf = malloc(CONFIG_SERIAL_RX_BUFFER_SIZE);
+#endif
+
        stdio_register_dev(&sdev, &upriv->sdev);
 #endif
        return 0;