of: Add support for ePAPR "stdout-path" property

ePAPR 1.1 defines the "stdout-path" property for specifying the console
device, but Linux currently only handles the older "linux,stdout-path"
property. This patch adds parsing for the new property name.

Signed-off-by: Grant Likely <grant.likely@linaro.org>

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 418a4ff9d97cb778c53ddf77b44898ac581fc1e2..be2861d69b025fa0bf0e44f94c5211d10d831232 100644 (file)
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1955,9 +1955,9 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
                of_chosen = of_find_node_by_path("/chosen@0");
 
        if (of_chosen) {
-               const char *name;
-
-               name = of_get_property(of_chosen, "linux,stdout-path", NULL);
+               const char *name = of_get_property(of_chosen, "stdout-path", NULL);
+               if (!name)
+                       name = of_get_property(of_chosen, "linux,stdout-path", NULL);
                if (name)
                        of_stdout = of_find_node_by_path(name);
        }