Merge tag 'arc-fixes-for-2020.07-rc1' of https://gitlab.denx.de/u-boot/custodians...

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

diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index ffcd6d15af2b07049fc5973a68c4478b2fc510ce..7703c674929ceae005cf7e71d41f88fc9475f68c 100644 (file)
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -5,8 +5,9 @@
 
 #include <common.h>
 #include <dm.h>
-#include <environment.h>
+#include <env_internal.h>
 #include <errno.h>
+#include <malloc.h>
 #include <os.h>
 #include <serial.h>
 #include <stdio_dev.h>
@@ -29,29 +30,31 @@ static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE;
 #if CONFIG_IS_ENABLED(SERIAL_PRESENT)
 static int serial_check_stdout(const void *blob, struct udevice **devp)
 {
-       int node;
+       int node = -1;
+       const char *str, *p, *name;
+       int namelen;
 
        /* Check for a chosen console */
-       node = fdtdec_get_chosen_node(blob, "stdout-path");
-       if (node < 0) {
-               const char *str, *p, *name;
-
-               /*
-                * Deal with things like
-                *      stdout-path = "serial0:115200n8";
-                *
-                * We need to look up the alias and then follow it to the
-                * correct node.
-                */
-               str = fdtdec_get_chosen_prop(blob, "stdout-path");
-               if (str) {
-                       p = strchr(str, ':');
-                       name = fdt_get_alias_namelen(blob, str,
-                                       p ? p - str : strlen(str));
+       str = fdtdec_get_chosen_prop(blob, "stdout-path");
+       if (str) {
+               p = strchr(str, ':');
+               namelen = p ? p - str : strlen(str);
+               node = fdt_path_offset_namelen(blob, str, namelen);
+
+               if (node < 0) {
+                       /*
+                        * Deal with things like
+                        *      stdout-path = "serial0:115200n8";
+                        *
+                        * We need to look up the alias and then follow it to
+                        * the correct node.
+                        */
+                       name = fdt_get_alias_namelen(blob, str, namelen);
                        if (name)
                                node = fdt_path_offset(blob, name);
                }
        }
+
        if (node < 0)
                node = fdt_path_offset(blob, "console");
        if (!uclass_get_device_by_of_offset(UCLASS_SERIAL, node, devp))
@@ -159,6 +162,7 @@ int serial_init(void)
 #if CONFIG_IS_ENABLED(SERIAL_PRESENT)
        serial_find_console_or_panic();
        gd->flags |= GD_FLG_SERIAL_READY;
+       serial_setbrg();
 #endif
 
        return 0;
@@ -294,49 +298,40 @@ void serial_setbrg(void)
                ops->setbrg(gd->cur_serial_dev, gd->baudrate);
 }
 
-int serial_getconfig(uint *config)
+int serial_getconfig(struct udevice *dev, uint *config)
 {
        struct dm_serial_ops *ops;
 
-       if (!gd->cur_serial_dev)
-               return 0;
-
-       ops = serial_get_ops(gd->cur_serial_dev);
+       ops = serial_get_ops(dev);
        if (ops->getconfig)
-               return ops->getconfig(gd->cur_serial_dev, config);
+               return ops->getconfig(dev, config);
 
        return 0;
 }
 
-int serial_setconfig(uint config)
+int serial_setconfig(struct udevice *dev, uint config)
 {
        struct dm_serial_ops *ops;
 
-       if (!gd->cur_serial_dev)
-               return 0;
-
-       ops = serial_get_ops(gd->cur_serial_dev);
+       ops = serial_get_ops(dev);
        if (ops->setconfig)
-               return ops->setconfig(gd->cur_serial_dev, config);
+               return ops->setconfig(dev, config);
 
        return 0;
 }
 
-int serial_getinfo(struct serial_device_info *info)
+int serial_getinfo(struct udevice *dev, struct serial_device_info *info)
 {
        struct dm_serial_ops *ops;
 
-       if (!gd->cur_serial_dev)
-               return -ENODEV;
-
        if (!info)
                return -EINVAL;
 
        info->baudrate = gd->baudrate;
 
-       ops = serial_get_ops(gd->cur_serial_dev);
+       ops = serial_get_ops(dev);
        if (ops->getinfo)
-               return ops->getinfo(gd->cur_serial_dev, info);
+               return ops->getinfo(dev, info);
 
        return -EINVAL;
 }