Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

Pull device tree updates from Grant Likely:
 "The branch contains the following device tree changes the v3.17 merge
  window:

  Group changes to the device tree.  In preparation for adding device
  tree overlay support, OF_DYNAMIC is reworked so that a set of device
  tree changes can be prepared and applied to the tree all at once.
  OF_RECONFIG notifiers see the most significant change here so that
  users always get a consistent view of the tree.  Notifiers generation
  is moved from before a change to after it, and notifiers for a group
  of changes are emitted after the entire block of changes have been
  applied

  Automatic console selection from DT.  Console drivers can now use
  of_console_check() to see if the device node is specified as a console
  device.  If so then it gets added as a preferred console.  UART
  devices get this support automatically when uart_add_one_port() is
  called.

  DT unit tests no longer depend on pre-loaded data in the device tree.
  Data is loaded dynamically at the start of unit tests, and then
  unloaded again when the tests have completed.

  Also contains a few bugfixes for reserved regions and early memory
  setup"

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux: (21 commits)
  of: Fixing OF Selftest build error
  drivers: of: add automated assignment of reserved regions to client devices
  of: Use proper types for checking memory overflow
  of: typo fix in __of_prop_dup()
  Adding selftest testdata dynamically into live tree
  of: Add todo tasklist for Devicetree
  of: Transactional DT support.
  of: Reorder device tree changes and notifiers
  of: Move dynamic node fixups out of powerpc and into common code
  of: Make sure attached nodes don't carry along extra children
  of: Make devicetree sysfs update functions consistent.
  of: Create unlocked versions of node and property add/remove functions
  OF: Utility helper functions for dynamic nodes
  of: Move CONFIG_OF_DYNAMIC code into a separate file
  of: rename of_aliases_mutex to just of_mutex
  of/platform: Fix of_platform_device_destroy iteration of devices
  of: Migrate of_find_node_by_name() users to for_each_node_by_name()
  tty: Update hypervisor tty drivers to use core stdout parsing code.
  arm/versatile: Add the uart as the stdout device.
  of: Enable console on serial ports specified by /chosen/stdout-path
  ...

9 files changed, 14 insertions, 93 deletions

diff --git a/arch/arm/boot/dts/versatile-ab.dts b/arch/arm/boot/dts/versatile-ab.dts
index 36c771a2d765..27d0d9c8adf3 100644
--- a/arch/arm/boot/dts/versatile-ab.dts
+++ b/arch/arm/boot/dts/versatile-ab.dts
@@ -15,6 +15,10 @@
                 i2c0 = &i2c0;
         };
 
+        chosen {
+                stdout-path = &uart0;
+        };
+
         memory {
                 reg = <0x0 0x08000000>;
         };
diff --git a/arch/arm/boot/dts/versatile-pb.dts b/arch/arm/boot/dts/versatile-pb.dts
index d025048119d3..e36c1e82fea7 100644
--- a/arch/arm/boot/dts/versatile-pb.dts
+++ b/arch/arm/boot/dts/versatile-pb.dts
@@ -56,5 +56,3 @@
                 };
         };
 };
-
-#include <testcases.dtsi>
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 1a3b1055f5eb..4e139f8a69ef 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -818,76 +818,6 @@ int cpu_to_chip_id(int cpu)
 }
 EXPORT_SYMBOL(cpu_to_chip_id);
 
-#ifdef CONFIG_PPC_PSERIES
-/*
- * Fix up the uninitialized fields in a new device node:
- * name, type and pci-specific fields
- */
-
-static int of_finish_dynamic_node(struct device_node *node)
-{
-        struct device_node *parent = of_get_parent(node);
-        int err = 0;
-        const phandle *ibm_phandle;
-
-        node->name = of_get_property(node, "name", NULL);
-        node->type = of_get_property(node, "device_type", NULL);
-
-        if (!node->name)
-                node->name = "<NULL>";
-        if (!node->type)
-                node->type = "<NULL>";
-
-        if (!parent) {
-                err = -ENODEV;
-                goto out;
-        }
-
-        /* We don't support that function on PowerMac, at least
-         * not yet
-         */
-        if (machine_is(powermac))
-                return -ENODEV;
-
-        /* fix up new node's phandle field */
-        if ((ibm_phandle = of_get_property(node, "ibm,phandle", NULL)))
-                node->phandle = *ibm_phandle;
-
-out:
-        of_node_put(parent);
-        return err;
-}
-
-static int prom_reconfig_notifier(struct notifier_block *nb,
-                                  unsigned long action, void *node)
-{
-        int err;
-
-        switch (action) {
-        case OF_RECONFIG_ATTACH_NODE:
-                err = of_finish_dynamic_node(node);
-                if (err < 0)
-                        printk(KERN_ERR "finish_node returned %d\n", err);
-                break;
-        default:
-                err = 0;
-                break;
-        }
-        return notifier_from_errno(err);
-}
-
-static struct notifier_block prom_reconfig_nb = {
-        .notifier_call = prom_reconfig_notifier,
-        .priority = 10, /* This one needs to run first */
-};
-
-static int __init prom_reconfig_setup(void)
-{
-        return of_reconfig_notifier_register(&prom_reconfig_nb);
-}
-__initcall(prom_reconfig_setup);
-#endif
-
 bool arch_match_cpu_phys_id(int cpu, u64 phys_id)
 {
         return (int)phys_id == get_hard_smp_processor_id(cpu);
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index 1413e72bc2e1..4882bfd90e27 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -2805,25 +2805,20 @@ set_initial_features(void)
                 /* Enable GMAC for now for PCI probing. It will be disabled
                  * later on after PCI probe
                  */
-                np = of_find_node_by_name(NULL, "ethernet");
-                while(np) {
+                for_each_node_by_name(np, "ethernet")
                         if (of_device_is_compatible(np, "K2-GMAC"))
                                 g5_gmac_enable(np, 0, 1);
-                        np = of_find_node_by_name(np, "ethernet");
-                }
 
                 /* Enable FW before PCI probe. Will be disabled later on
                  * Note: We should have a batter way to check that we are
                  * dealing with uninorth internal cell and not a PCI cell
                  * on the external PCI. The code below works though.
                  */
-                np = of_find_node_by_name(NULL, "firewire");
-                while(np) {
+                for_each_node_by_name(np, "firewire") {
                         if (of_device_is_compatible(np, "pci106b,5811")) {
                                 macio_chips[0].flags |= MACIO_FLAG_FW_SUPPORTED;
                                 g5_fw_enable(np, 0, 1);
                         }
-                        np = of_find_node_by_name(np, "firewire");
                 }
         }
 #else /* CONFIG_PPC64 */
@@ -2834,13 +2829,11 @@ set_initial_features(void)
                 /* Enable GMAC for now for PCI probing. It will be disabled
                  * later on after PCI probe
                  */
-                np = of_find_node_by_name(NULL, "ethernet");
-                while(np) {
+                for_each_node_by_name(np, "ethernet") {
                         if (np->parent
                             && of_device_is_compatible(np->parent, "uni-north")
                             && of_device_is_compatible(np, "gmac"))
                                 core99_gmac_enable(np, 0, 1);
-                        np = of_find_node_by_name(np, "ethernet");
                 }
 
                 /* Enable FW before PCI probe. Will be disabled later on
@@ -2848,8 +2841,7 @@ set_initial_features(void)
                  * dealing with uninorth internal cell and not a PCI cell
                  * on the external PCI. The code below works though.
                  */
-                np = of_find_node_by_name(NULL, "firewire");
-                while(np) {
+                for_each_node_by_name(np, "firewire") {
                         if (np->parent
                             && of_device_is_compatible(np->parent, "uni-north")
                             && (of_device_is_compatible(np, "pci106b,18") ||
@@ -2858,18 +2850,16 @@ set_initial_features(void)
                                 macio_chips[0].flags |= MACIO_FLAG_FW_SUPPORTED;
                                 core99_firewire_enable(np, 0, 1);
                         }
-                        np = of_find_node_by_name(np, "firewire");
                 }
 
                 /* Enable ATA-100 before PCI probe. */
                 np = of_find_node_by_name(NULL, "ata-6");
-                while(np) {
+                for_each_node_by_name(np, "ata-6") {
                         if (np->parent
                             && of_device_is_compatible(np->parent, "uni-north")
                             && of_device_is_compatible(np, "kauai-ata")) {
                                 core99_ata100_enable(np, 1);
                         }
-                        np = of_find_node_by_name(np, "ata-6");
                 }
 
                 /* Switch airport off */
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index cf7009b8c7b6..7e868ccf3b0d 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -698,7 +698,7 @@ static void __init fixup_nec_usb2(void)
 {
         struct device_node *nec;
 
-        for (nec = NULL; (nec = of_find_node_by_name(nec, "usb")) != NULL;) {
+        for_each_node_by_name(nec, "usb") {
                 struct pci_controller *hose;
                 u32 data;
                 const u32 *prop;
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index 5cbd4d67d5c4..af094ae03dbb 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -577,7 +577,7 @@ static void __init smp_core99_setup_i2c_hwsync(int ncpus)
         int ok;
 
         /* Look for the clock chip */
-        while ((cc = of_find_node_by_name(cc, "i2c-hwclock")) != NULL) {
+        for_each_node_by_name(cc, "i2c-hwclock") {
                 p = of_get_parent(cc);
                 ok = p && of_device_is_compatible(p, "uni-n-i2c");
                 of_node_put(p);
diff --git a/arch/powerpc/platforms/powermac/udbg_adb.c b/arch/powerpc/platforms/powermac/udbg_adb.c
index 44e0b55a2a02..366bd221edec 100644
--- a/arch/powerpc/platforms/powermac/udbg_adb.c
+++ b/arch/powerpc/platforms/powermac/udbg_adb.c
@@ -191,7 +191,7 @@ int __init udbg_adb_init(int force_btext)
          * of type "adb". If not, we return a failure, but we keep the
          * bext output set for now
          */
-        for (np = NULL; (np = of_find_node_by_name(np, "keyboard")) != NULL;) {
+        for_each_node_by_name(np, "keyboard") {
                 struct device_node *parent = of_get_parent(np);
                 int found = (parent && strcmp(parent->type, "adb") == 0);
                 of_node_put(parent);
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 7995135170a3..ac01e188faef 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -194,7 +194,7 @@ static int pseries_update_drconf_memory(struct of_prop_reconfig *pr)
         if (!memblock_size)
                 return -EINVAL;
 
-        p = (u32 *)of_get_property(pr->dn, "ibm,dynamic-memory", NULL);
+        p = (u32 *) pr->old_prop->value;
         if (!p)
                 return -EINVAL;
 
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index cfe8a6389a51..e724d3186e73 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -232,8 +232,7 @@ static void __init pseries_discover_pic(void)
         struct device_node *np;
         const char *typep;
 
-        for (np = NULL; (np = of_find_node_by_name(np,
-                                                   "interrupt-controller"));) {
+        for_each_node_by_name(np, "interrupt-controller") {
                 typep = of_get_property(np, "compatible", NULL);
                 if (strstr(typep, "open-pic")) {
                         pSeries_mpic_node = of_node_get(np);