Merge branch 'devicetree/next-console' into devicetree/next

9 files changed, 44 insertions, 93 deletions

diff --git a/drivers/cpufreq/pmac64-cpufreq.c b/drivers/cpufreq/pmac64-cpufreq.c
index 8bc422977b5b..4ff86878727f 100644
--- a/drivers/cpufreq/pmac64-cpufreq.c
+++ b/drivers/cpufreq/pmac64-cpufreq.c
@@ -499,8 +499,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpunode)
         }
 
         /* Lookup the i2c hwclock */
-        for (hwclock = NULL;
-             (hwclock = of_find_node_by_name(hwclock, "i2c-hwclock")) != NULL;){
+        for_each_node_by_name(hwclock, "i2c-hwclock") {
                 const char *loc = of_get_property(hwclock,
                                 "hwctrl-location", NULL);
                 if (loc == NULL)
diff --git a/drivers/edac/cell_edac.c b/drivers/edac/cell_edac.c
index 374b57fc596d..a12c8552f6a6 100644
--- a/drivers/edac/cell_edac.c
+++ b/drivers/edac/cell_edac.c
@@ -134,8 +134,7 @@ static void cell_edac_init_csrows(struct mem_ctl_info *mci)
         int                             j;
         u32                             nr_pages;
 
-        for (np = NULL;
-             (np = of_find_node_by_name(np, "memory")) != NULL;) {
+        for_each_node_by_name(np, "memory") {
                 struct resource r;
 
                 /* We "know" that the Cell firmware only creates one entry
diff --git a/drivers/of/base.c b/drivers/of/base.c
index b9864806e9b8..e4f95ba0a3eb 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -17,6 +17,7 @@
  *      as published by the Free Software Foundation; either version
  *      2 of the License, or (at your option) any later version.
  */
+#include <linux/console.h>
 #include <linux/ctype.h>
 #include <linux/cpu.h>
 #include <linux/module.h>
@@ -35,7 +36,7 @@ struct device_node *of_allnodes;
 EXPORT_SYMBOL(of_allnodes);
 struct device_node *of_chosen;
 struct device_node *of_aliases;
-static struct device_node *of_stdout;
+struct device_node *of_stdout;
 
 static struct kset *of_kset;
 
@@ -2062,9 +2063,12 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
                 of_chosen = of_find_node_by_path("/chosen@0");
 
         if (of_chosen) {
+                /* linux,stdout-path and /aliases/stdout are for legacy compatibility */
                 const char *name = of_get_property(of_chosen, "stdout-path", NULL);
                 if (!name)
                         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)
                         of_stdout = of_find_node_by_path(name);
         }
@@ -2180,20 +2184,22 @@ const char *of_prop_next_string(struct property *prop, const char *cur)
 EXPORT_SYMBOL_GPL(of_prop_next_string);
 
 /**
- * of_device_is_stdout_path - check if a device node matches the
- *                            linux,stdout-path property
- *
- * Check if this device node matches the linux,stdout-path property
- * in the chosen node. return true if yes, false otherwise.
+ * of_console_check() - Test and setup console for DT setup
+ * @dn - Pointer to device node
+ * @name - Name to use for preferred console without index. ex. "ttyS"
+ * @index - Index to use for preferred console.
+ *
+ * Check if the given device node matches the stdout-path property in the
+ * /chosen node. If it does then register it as the preferred console and return
+ * TRUE. Otherwise return FALSE.
  */
-int of_device_is_stdout_path(struct device_node *dn)
+bool of_console_check(struct device_node *dn, char *name, int index)
 {
-        if (!of_stdout)
+        if (!dn || dn != of_stdout || console_set_on_cmdline)
                 return false;
-
-        return of_stdout == dn;
+        return add_preferred_console(name, index, NULL);
 }
-EXPORT_SYMBOL_GPL(of_device_is_stdout_path);
+EXPORT_SYMBOL_GPL(of_console_check);
 
 /**
  *      of_find_next_cache_node - Find a node's subsidiary cache
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index 93aa29f6d39c..f2945fa73d4f 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -375,11 +375,11 @@ static void __exit cleanup_slots(void)
 
 static int __init rpaphp_init(void)
 {
-        struct device_node *dn = NULL;
+        struct device_node *dn;
 
         info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
 
-        while ((dn = of_find_node_by_name(dn, "pci")))
+        for_each_node_by_name(dn, "pci")
                 rpaphp_add_slot(dn);
 
         return 0;
diff --git a/drivers/tty/ehv_bytechan.c b/drivers/tty/ehv_bytechan.c
index 0419b69e270f..4f485e88f60c 100644
--- a/drivers/tty/ehv_bytechan.c
+++ b/drivers/tty/ehv_bytechan.c
@@ -108,55 +108,23 @@ static void disable_tx_interrupt(struct ehv_bc_data *bc)
  *
  * The byte channel to be used for the console is specified via a "stdout"
  * property in the /chosen node.
- *
- * For compatible with legacy device trees, we also look for a "stdout" alias.
  */
 static int find_console_handle(void)
 {
-        struct device_node *np, *np2;
+        struct device_node *np = of_stdout;
         const char *sprop = NULL;
         const uint32_t *iprop;
 
-        np = of_find_node_by_path("/chosen");
-        if (np)
-                sprop = of_get_property(np, "stdout-path", NULL);
-
-        if (!np || !sprop) {
-                of_node_put(np);
-                np = of_find_node_by_name(NULL, "aliases");
-                if (np)
-                        sprop = of_get_property(np, "stdout", NULL);
-        }
-
-        if (!sprop) {
-                of_node_put(np);
-                return 0;
-        }
-
         /* We don't care what the aliased node is actually called.  We only
          * care if it's compatible with "epapr,hv-byte-channel", because that
-         * indicates that it's a byte channel node.  We use a temporary
-         * variable, 'np2', because we can't release 'np' until we're done with
-         * 'sprop'.
+         * indicates that it's a byte channel node.
          */
-        np2 = of_find_node_by_path(sprop);
-        of_node_put(np);
-        np = np2;
-        if (!np) {
-                pr_warning("ehv-bc: stdout node '%s' does not exist\n", sprop);
-                return 0;
-        }
-
-        /* Is it a byte channel? */
-        if (!of_device_is_compatible(np, "epapr,hv-byte-channel")) {
-                of_node_put(np);
+        if (!np || !of_device_is_compatible(np, "epapr,hv-byte-channel"))
                 return 0;
-        }
 
         stdout_irq = irq_of_parse_and_map(np, 0);
         if (stdout_irq == NO_IRQ) {
-                pr_err("ehv-bc: no 'interrupts' property in %s node\n", sprop);
-                of_node_put(np);
+                pr_err("ehv-bc: no 'interrupts' property in %s node\n", np->full_name);
                 return 0;
         }
 
@@ -167,12 +135,9 @@ static int find_console_handle(void)
         if (!iprop) {
                 pr_err("ehv-bc: no 'hv-handle' property in %s node\n",
                        np->name);
-                of_node_put(np);
                 return 0;
         }
         stdout_bc = be32_to_cpu(*iprop);
-
-        of_node_put(np);
         return 1;
 }
 
diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c
index a585079b4b38..a2cc5f834c63 100644
--- a/drivers/tty/hvc/hvc_opal.c
+++ b/drivers/tty/hvc/hvc_opal.c
@@ -342,22 +342,13 @@ static void udbg_init_opal_common(void)
 
 void __init hvc_opal_init_early(void)
 {
-        struct device_node *stdout_node = NULL;
+        struct device_node *stdout_node = of_node_get(of_stdout);
         const __be32 *termno;
-        const char *name = NULL;
         const struct hv_ops *ops;
         u32 index;
 
-        /* find the boot console from /chosen/stdout */
-        if (of_chosen)
-                name = of_get_property(of_chosen, "linux,stdout-path", NULL);
-        if (name) {
-                stdout_node = of_find_node_by_path(name);
-                if (!stdout_node) {
-                        pr_err("hvc_opal: Failed to locate default console!\n");
-                        return;
-                }
-        } else {
+        /* If the console wasn't in /chosen, try /ibm,opal */
+        if (!stdout_node) {
                 struct device_node *opal, *np;
 
                 /* Current OPAL takeover doesn't provide the stdout
diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c
index b594abfbf21e..5618b5fc7500 100644
--- a/drivers/tty/hvc/hvc_vio.c
+++ b/drivers/tty/hvc/hvc_vio.c
@@ -404,42 +404,35 @@ module_exit(hvc_vio_exit);
 
 void __init hvc_vio_init_early(void)
 {
-        struct device_node *stdout_node;
         const __be32 *termno;
         const char *name;
         const struct hv_ops *ops;
 
         /* find the boot console from /chosen/stdout */
-        if (!of_chosen)
+        if (!of_stdout)
                 return;
-        name = of_get_property(of_chosen, "linux,stdout-path", NULL);
-        if (name == NULL)
-                return;
-        stdout_node = of_find_node_by_path(name);
-        if (!stdout_node)
-                return;
-        name = of_get_property(stdout_node, "name", NULL);
+        name = of_get_property(of_stdout, "name", NULL);
         if (!name) {
                 printk(KERN_WARNING "stdout node missing 'name' property!\n");
-                goto out;
+                return;
         }
 
         /* Check if it's a virtual terminal */
         if (strncmp(name, "vty", 3) != 0)
-                goto out;
-        termno = of_get_property(stdout_node, "reg", NULL);
+                return;
+        termno = of_get_property(of_stdout, "reg", NULL);
         if (termno == NULL)
-                goto out;
+                return;
         hvterm_priv0.termno = of_read_number(termno, 1);
         spin_lock_init(&hvterm_priv0.buf_lock);
         hvterm_privs[0] = &hvterm_priv0;
 
         /* Check the protocol */
-        if (of_device_is_compatible(stdout_node, "hvterm1")) {
+        if (of_device_is_compatible(of_stdout, "hvterm1")) {
                 hvterm_priv0.proto = HV_PROTOCOL_RAW;
                 ops = &hvterm_raw_ops;
         }
-        else if (of_device_is_compatible(stdout_node, "hvterm-protocol")) {
+        else if (of_device_is_compatible(of_stdout, "hvterm-protocol")) {
                 hvterm_priv0.proto = HV_PROTOCOL_HVSI;
                 ops = &hvterm_hvsi_ops;
                 hvsilib_init(&hvterm_priv0.hvsi, hvc_get_chars, hvc_put_chars,
@@ -447,7 +440,7 @@ void __init hvc_vio_init_early(void)
                 /* HVSI, perform the handshake now */
                 hvsilib_establish(&hvterm_priv0.hvsi);
         } else
-                goto out;
+                return;
         udbg_putc = udbg_hvc_putc;
         udbg_getc = udbg_hvc_getc;
         udbg_getc_poll = udbg_hvc_getc_poll;
@@ -456,14 +449,12 @@ void __init hvc_vio_init_early(void)
          * backend for HVSI, only do udbg
          */
         if (hvterm_priv0.proto == HV_PROTOCOL_HVSI)
-                goto out;
+                return;
 #endif
         /* Check whether the user has requested a different console. */
         if (!strstr(cmd_line, "console="))
                 add_preferred_console("hvc", 0, NULL);
         hvc_instantiate(0, 0, ops);
-out:
-        of_node_put(stdout_node);
 }
 
 /* call this from early_init() for a working debug console on
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 8193635103ee..01e180bc6b5d 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -1650,8 +1650,7 @@ static int __init pmz_probe(void)
         /*
          * Find all escc chips in the system
          */
-        node_p = of_find_node_by_name(NULL, "escc");
-        while (node_p) {
+        for_each_node_by_name(node_p, "escc") {
                 /*
                  * First get channel A/B node pointers
                  * 
@@ -1669,7 +1668,7 @@ static int __init pmz_probe(void)
                         of_node_put(node_b);
                         printk(KERN_ERR "pmac_zilog: missing node %c for escc %s\n",
                                 (!node_a) ? 'a' : 'b', node_p->full_name);
-                        goto next;
+                        continue;
                 }
 
                 /*
@@ -1696,11 +1695,9 @@ static int __init pmz_probe(void)
                         of_node_put(node_b);
                         memset(&pmz_ports[count], 0, sizeof(struct uart_pmac_port));
                         memset(&pmz_ports[count+1], 0, sizeof(struct uart_pmac_port));
-                        goto next;
+                        continue;
                 }
                 count += 2;
-next:
-                node_p = of_find_node_by_name(node_p, "escc");
         }
         pmz_ports_count = count;
 
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index fbf6c5ad222f..3ce68f962c92 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -26,6 +26,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/console.h>
+#include <linux/of.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/device.h>
@@ -2615,6 +2616,8 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
                 spin_lock_init(&uport->lock);
                 lockdep_set_class(&uport->lock, &port_lock_key);
         }
+        if (uport->cons && uport->dev)
+                of_console_check(uport->dev->of_node, uport->cons->name, uport->line);
 
         uart_configure_port(drv, state, uport);