Merge git://git.denx.de/u-boot-socfpga

[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 19f38e1..9cae9fb 100644 (file)
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -8,13 +8,13 @@
 #include <dm.h>
 #include <environment.h>
 #include <errno.h>
-#include <fdtdec.h>
 #include <os.h>
 #include <serial.h>
 #include <stdio_dev.h>
 #include <watchdog.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
+#include <dm/of_access.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -23,15 +23,57 @@ 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)
+{
+       int node;
+
+       /* 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));
+                       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))
+               return 0;
+
+       /*
+        * If the console is not marked to be bound before relocation, bind it
+        * anyway.
+        */
+       if (node > 0 && !lists_bind_fdt(gd->dm_root, offset_to_ofnode(node),
+                                       devp)) {
+               if (!device_probe(*devp))
+                       return 0;
+       }
+
+       return -ENODEV;
+}
+
 static void serial_find_console_or_panic(void)
 {
        const void *blob = gd->fdt_blob;
        struct udevice *dev;
-       int node;
 
        if (CONFIG_IS_ENABLED(OF_PLATDATA)) {
                uclass_first_device(UCLASS_SERIAL, &dev);
@@ -40,42 +82,17 @@ static void serial_find_console_or_panic(void)
                        return;
                }
        } else if (CONFIG_IS_ENABLED(OF_CONTROL) && blob) {
-               /* 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));
-                               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,
-                                                   &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 the console is not marked to be bound before relocation,
-                * bind it anyway.
-                */
-               if (node > 0 &&
-                   !lists_bind_fdt(gd->dm_root, blob, node, &dev)) {
-                       if (!device_probe(dev)) {
+                       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;
                        }
@@ -211,27 +228,30 @@ void serial_stdio_init(void)
 {
 }
 
-#if defined(CONFIG_DM_STDIO) && CONFIG_IS_ENABLED(SERIAL_PRESENT)
+#if defined(CONFIG_DM_STDIO)
+
+#if CONFIG_IS_ENABLED(SERIAL_PRESENT)
 static void serial_stub_putc(struct stdio_dev *sdev, const char ch)
 {
        _serial_putc(sdev->priv, ch);
 }
 #endif
 
-void serial_stub_puts(struct stdio_dev *sdev, const char *str)
+static void serial_stub_puts(struct stdio_dev *sdev, const char *str)
 {
        _serial_puts(sdev->priv, str);
 }
 
-int serial_stub_getc(struct stdio_dev *sdev)
+static int serial_stub_getc(struct stdio_dev *sdev)
 {
        return _serial_getc(sdev->priv);
 }
 
-int serial_stub_tstc(struct stdio_dev *sdev)
+static int serial_stub_tstc(struct stdio_dev *sdev)
 {
        return _serial_tstc(sdev->priv);
 }
+#endif
 
 /**
  * on_baudrate() - Update the actual baudrate when the env var changes
@@ -346,10 +366,10 @@ static int serial_post_probe(struct udevice *dev)
 
 static int serial_pre_remove(struct udevice *dev)
 {
-#ifdef CONFIG_SYS_STDIO_DEREGISTER
+#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
        struct serial_dev_priv *upriv = dev_get_uclass_priv(dev);
 
-       if (stdio_deregister_dev(upriv->sdev, 0))
+       if (stdio_deregister_dev(upriv->sdev, true))
                return -EPERM;
 #endif