From: Peter Hurley <peter@hurleysoftware.com>
Date: Sun, 1 Mar 2015 17:21:22 +0000 (-0500)
Subject: of: Fix premature bootconsole disable with 'stdout-path'
X-Git-Tag: firefly_0821_release~176^2~2165^2~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2fa645cb2703d9b3786d850db815414dfeefa51d;p=firefly-linux-kernel-4.4.55.git

of: Fix premature bootconsole disable with 'stdout-path'

Support for devicetree serial consoles via 'stdout-path' causes
bootconsoles to be disabled when the vt dummy console loads, since
there is no preferred console (the preferred console is not added
until the device is probed).

Ensure there is at least a preferred console, even if never matched.

Requires: "console: Fix console name size mismatch"
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Rob Herring <robh@kernel.org>
---

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 0a8aeb8523fe..3b1aa08bf5f3 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1886,8 +1886,10 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
 			name = of_get_property(of_chosen, "linux,stdout-path", NULL);
 		if (IS_ENABLED(CONFIG_PPC) && !name)
 			name = of_get_property(of_aliases, "stdout", NULL);
-		if (name)
+		if (name) {
 			of_stdout = of_find_node_opts_by_path(name, &of_stdout_options);
+			add_preferred_console("stdout-path", 0, NULL);
+		}
 	}
 
 	if (!of_aliases)