dm: serial: Handle "stdout-path" with ":options" correctly

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

diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index dcdaedefe72e96a0de41b6b6de63b980554a5f6a..0f5f1fa4068cfe719000ee9e74916a729318f1fb 100644 (file)
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -29,29 +29,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))