Merge tag 'dm-9oct18' of git://git.denx.de/u-boot-dm

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

diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 2e5116f..e50f0aa 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>
@@ -27,6 +26,7 @@ static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE;
 #error "Serial is required before relocation - define CONFIG_$(SPL_)SYS_MALLOC_F_LEN to make this work"
 #endif
 
+#if CONFIG_IS_ENABLED(SERIAL_PRESENT)
 static int serial_check_stdout(const void *blob, struct udevice **devp)
 {
        int node;
@@ -74,6 +74,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);
@@ -104,20 +107,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
        }
 
@@ -125,12 +151,15 @@ static void serial_find_console_or_panic(void)
        panic_str("No serial driver found");
 #endif
 }
+#endif /* CONFIG_SERIAL_PRESENT */
 
 /* Called prior to relocation */
 int serial_init(void)
 {
+#if CONFIG_IS_ENABLED(SERIAL_PRESENT)
        serial_find_console_or_panic();
        gd->flags |= GD_FLG_SERIAL_READY;
+#endif
 
        return 0;
 }
@@ -203,6 +232,9 @@ static int _serial_getc(struct udevice *dev)
        struct serial_dev_priv *upriv = dev_get_uclass_priv(dev);
        char val;
 
+       if (upriv->rd_ptr == upriv->wr_ptr)
+               return __serial_getc(dev);
+
        val = upriv->buf[upriv->rd_ptr++];
        upriv->rd_ptr %= CONFIG_SERIAL_RX_BUFFER_SIZE;
 
@@ -262,6 +294,20 @@ void serial_setbrg(void)
                ops->setbrg(gd->cur_serial_dev, gd->baudrate);
 }
 
+int serial_setconfig(uint config)
+{
+       struct dm_serial_ops *ops;
+
+       if (!gd->cur_serial_dev)
+               return 0;
+
+       ops = serial_get_ops(gd->cur_serial_dev);
+       if (ops->setconfig)
+               return ops->setconfig(gd->cur_serial_dev, config);
+
+       return 0;
+}
+
 void serial_stdio_init(void)
 {
 }
@@ -373,6 +419,8 @@ static int serial_post_probe(struct udevice *dev)
                ops->pending += gd->reloc_off;
        if (ops->clear)
                ops->clear += gd->reloc_off;
+       if (ops->setconfig)
+               ops->setconfig += gd->reloc_off;
 #if CONFIG_POST & CONFIG_SYS_POST_UART
        if (ops->loop)
                ops->loop += gd->reloc_off