Merge branch 'dt' into next

25 files changed, 267 insertions, 292 deletions

diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 4748ec551a68..d61b915ce52c 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -211,7 +211,7 @@ static void __init update_fec_mac_prop(enum mac_oui oui)
                 macaddr[4] = (val >> 8) & 0xff;
                 macaddr[5] = (val >> 0) & 0xff;
 
-                prom_update_property(np, newmac);
+                of_update_property(np, newmac);
         }
 }
 
diff --git a/arch/powerpc/include/asm/pSeries_reconfig.h b/arch/powerpc/include/asm/pSeries_reconfig.h
deleted file mode 100644
index c07edfe98b98..000000000000
--- a/arch/powerpc/include/asm/pSeries_reconfig.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef _PPC64_PSERIES_RECONFIG_H
-#define _PPC64_PSERIES_RECONFIG_H
-#ifdef __KERNEL__
-
-#include <linux/notifier.h>
-
-/*
- * Use this API if your code needs to know about OF device nodes being
- * added or removed on pSeries systems.
- */
-
-#define PSERIES_RECONFIG_ADD            0x0001
-#define PSERIES_RECONFIG_REMOVE         0x0002
-#define PSERIES_DRCONF_MEM_ADD          0x0003
-#define PSERIES_DRCONF_MEM_REMOVE       0x0004
-#define PSERIES_UPDATE_PROPERTY         0x0005
-
-/**
- * pSeries_reconfig_notify - Notifier value structure for OFDT property updates
- *
- * @node: Device tree node which owns the property being updated
- * @property: Updated property
- */
-struct pSeries_reconfig_prop_update {
-        struct device_node *node;
-        struct property *property;
-};
-
-#ifdef CONFIG_PPC_PSERIES
-extern int pSeries_reconfig_notifier_register(struct notifier_block *);
-extern void pSeries_reconfig_notifier_unregister(struct notifier_block *);
-extern int pSeries_reconfig_notify(unsigned long action, void *p);
-/* Not the best place to put this, will be fixed when we move some
- * of the rtas suspend-me stuff to pseries */
-extern void pSeries_coalesce_init(void);
-#else /* !CONFIG_PPC_PSERIES */
-static inline int pSeries_reconfig_notifier_register(struct notifier_block *nb)
-{
-        return 0;
-}
-static inline void pSeries_reconfig_notifier_unregister(struct notifier_block *nb) { }
-static inline void pSeries_coalesce_init(void) { }
-#endif /* CONFIG_PPC_PSERIES */
-
-
-#endif /* __KERNEL__ */
-#endif /* _PPC64_PSERIES_RECONFIG_H */
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h
index b5c91901e384..99c92d5363e4 100644
--- a/arch/powerpc/include/asm/prom.h
+++ b/arch/powerpc/include/asm/prom.h
@@ -58,6 +58,22 @@ static inline int of_node_to_nid(struct device_node *device) { return 0; }
 
 extern void of_instantiate_rtc(void);
 
+/* The of_drconf_cell struct defines the layout of the LMB array
+ * specified in the device tree property
+ * ibm,dynamic-reconfiguration-memory/ibm,dynamic-memory
+ */
+struct of_drconf_cell {
+        u64     base_addr;
+        u32     drc_index;
+        u32     reserved;
+        u32     aa_index;
+        u32     flags;
+};
+
+#define DRCONF_MEM_ASSIGNED     0x00000008
+#define DRCONF_MEM_AI_INVALID   0x00000040
+#define DRCONF_MEM_RESERVED     0x00000080
+
 /* These includes are put at the bottom because they may contain things
  * that are overridden by this file.  Ideally they shouldn't be included
  * by this file, but there are a bunch of .c files that currently depend
diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
index 557cff845dee..aef00c675905 100644
--- a/arch/powerpc/include/asm/rtas.h
+++ b/arch/powerpc/include/asm/rtas.h
@@ -353,8 +353,13 @@ static inline int page_is_rtas_user_buf(unsigned long pfn)
                 return 1;
         return 0;
 }
+
+/* Not the best place to put pSeries_coalesce_init, will be fixed when we
+ * move some of the rtas suspend-me stuff to pseries */
+extern void pSeries_coalesce_init(void);
 #else
 static inline int page_is_rtas_user_buf(unsigned long pfn) { return 0;}
+static inline void pSeries_coalesce_init(void) { }
 #endif
 
 extern int call_rtas(const char *, int, int, unsigned long *, ...);
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c
index fa9f6c72f557..e1ec57e87b3b 100644
--- a/arch/powerpc/kernel/machine_kexec.c
+++ b/arch/powerpc/kernel/machine_kexec.c
@@ -218,23 +218,23 @@ static void __init export_crashk_values(struct device_node *node)
          * be sure what's in them, so remove them. */
         prop = of_find_property(node, "linux,crashkernel-base", NULL);
         if (prop)
-                prom_remove_property(node, prop);
+                of_remove_property(node, prop);
 
         prop = of_find_property(node, "linux,crashkernel-size", NULL);
         if (prop)
-                prom_remove_property(node, prop);
+                of_remove_property(node, prop);
 
         if (crashk_res.start != 0) {
-                prom_add_property(node, &crashk_base_prop);
+                of_add_property(node, &crashk_base_prop);
                 crashk_size = resource_size(&crashk_res);
-                prom_add_property(node, &crashk_size_prop);
+                of_add_property(node, &crashk_size_prop);
         }
 
         /*
          * memory_limit is required by the kexec-tools to limit the
          * crash regions to the actual memory used.
          */
-        prom_update_property(node, &memory_limit_prop);
+        of_update_property(node, &memory_limit_prop);
 }
 
 static int __init kexec_setup(void)
@@ -249,11 +249,11 @@ static int __init kexec_setup(void)
         /* remove any stale properties so ours can be found */
         prop = of_find_property(node, kernel_end_prop.name, NULL);
         if (prop)
-                prom_remove_property(node, prop);
+                of_remove_property(node, prop);
 
         /* information needed by userspace when using default_machine_kexec */
         kernel_end = __pa(_end);
-        prom_add_property(node, &kernel_end_prop);
+        of_add_property(node, &kernel_end_prop);
 
         export_crashk_values(node);
 
diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index d7f609086a99..7206701b1ff1 100644
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -389,14 +389,14 @@ static int __init export_htab_values(void)
         /* remove any stale propertys so ours can be found */
         prop = of_find_property(node, htab_base_prop.name, NULL);
         if (prop)
-                prom_remove_property(node, prop);
+                of_remove_property(node, prop);
         prop = of_find_property(node, htab_size_prop.name, NULL);
         if (prop)
-                prom_remove_property(node, prop);
+                of_remove_property(node, prop);
 
         htab_base = __pa(htab_address);
-        prom_add_property(node, &htab_base_prop);
-        prom_add_property(node, &htab_size_prop);
+        of_add_property(node, &htab_base_prop);
+        of_add_property(node, &htab_size_prop);
 
         of_node_put(node);
         return 0;
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 4b06ec5a502e..64f526a321f5 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -208,7 +208,7 @@ pci_create_OF_bus_map(void)
                 of_prop->name = "pci-OF-bus-map";
                 of_prop->length = 256;
                 of_prop->value = &of_prop[1];
-                prom_add_property(dn, of_prop);
+                of_add_property(dn, of_prop);
                 of_node_put(dn);
         }
 }
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index f5ca76a79c88..8b6f7a99cce2 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -32,6 +32,7 @@
 #include <linux/debugfs.h>
 #include <linux/irq.h>
 #include <linux/memblock.h>
+#include <linux/of.h>
 
 #include <asm/prom.h>
 #include <asm/rtas.h>
@@ -49,7 +50,6 @@
 #include <asm/btext.h>
 #include <asm/sections.h>
 #include <asm/machdep.h>
-#include <asm/pSeries_reconfig.h>
 #include <asm/pci-bridge.h>
 #include <asm/kexec.h>
 #include <asm/opal.h>
@@ -803,7 +803,7 @@ static int prom_reconfig_notifier(struct notifier_block *nb,
         int err;
 
         switch (action) {
-        case PSERIES_RECONFIG_ADD:
+        case OF_RECONFIG_ATTACH_NODE:
                 err = of_finish_dynamic_node(node);
                 if (err < 0)
                         printk(KERN_ERR "finish_node returned %d\n", err);
@@ -822,7 +822,7 @@ static struct notifier_block prom_reconfig_nb = {
 
 static int __init prom_reconfig_setup(void)
 {
-        return pSeries_reconfig_notifier_register(&prom_reconfig_nb);
+        return of_reconfig_notifier_register(&prom_reconfig_nb);
 }
 __initcall(prom_reconfig_setup);
 #endif
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index fcec38241f79..1fd6e7b2f390 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -42,7 +42,6 @@
 #include <asm/time.h>
 #include <asm/mmu.h>
 #include <asm/topology.h>
-#include <asm/pSeries_reconfig.h>
 
 struct rtas_t rtas = {
         .lock = __ARCH_SPIN_LOCK_UNLOCKED
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 59213cfaeca9..bba87ca2b4d7 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -399,18 +399,6 @@ static unsigned long read_n_cells(int n, const unsigned int **buf)
         return result;
 }
 
-struct of_drconf_cell {
-        u64     base_addr;
-        u32     drc_index;
-        u32     reserved;
-        u32     aa_index;
-        u32     flags;
-};
-
-#define DRCONF_MEM_ASSIGNED     0x00000008
-#define DRCONF_MEM_AI_INVALID   0x00000040
-#define DRCONF_MEM_RESERVED     0x00000080
-
 /*
  * Read the next memblock list entry from the ibm,dynamic-memory property
  * and return the information in the provided of_drconf_cell structure.
diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c
index 848a3e98e1c1..8fb12570b2f5 100644
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@ -539,7 +539,7 @@ static void __init p1022_ds_setup_arch(void)
                                 };
 
                                 /*
-                                 * prom_update_property() is called before
+                                 * of_update_property() is called before
                                  * kmalloc() is available, so the 'new' object
                                  * should be allocated in the global area.
                                  * The easiest way is to do that is to
@@ -548,7 +548,7 @@ static void __init p1022_ds_setup_arch(void)
                                  */
                                 pr_info("p1022ds: disabling %s node",
                                         np2->full_name);
-                                prom_update_property(np2, &nor_status);
+                                of_update_property(np2, &nor_status);
                                 of_node_put(np2);
                         }
 
@@ -564,7 +564,7 @@ static void __init p1022_ds_setup_arch(void)
 
                                 pr_info("p1022ds: disabling %s node",
                                         np2->full_name);
-                                prom_update_property(np2, &nand_status);
+                                of_update_property(np2, &nand_status);
                                 of_node_put(np2);
                         }
 
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
index 56d26bc4fd41..09787139834d 100644
--- a/arch/powerpc/platforms/ps3/os-area.c
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -280,13 +280,13 @@ static void os_area_set_property(struct device_node *node,
 
         if (tmp) {
                 pr_debug("%s:%d found %s\n", __func__, __LINE__, prop->name);
-                prom_remove_property(node, tmp);
+                of_remove_property(node, tmp);
         }
 
-        result = prom_add_property(node, prop);
+        result = of_add_property(node, prop);
 
         if (result)
-                pr_debug("%s:%d prom_set_property failed\n", __func__,
+                pr_debug("%s:%d of_set_property failed\n", __func__,
                         __LINE__);
 }
 
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index 0f1b706506ed..a1a7b9a67ffd 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -13,17 +13,16 @@
 #include <linux/kernel.h>
 #include <linux/kref.h>
 #include <linux/notifier.h>
-#include <linux/proc_fs.h>
 #include <linux/spinlock.h>
 #include <linux/cpu.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 #include "offline_states.h"
 
 #include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/uaccess.h>
 #include <asm/rtas.h>
-#include <asm/pSeries_reconfig.h>
 
 struct cc_workarea {
         u32     drc_index;
@@ -255,9 +254,6 @@ static struct device_node *derive_parent(const char *path)
 
 int dlpar_attach_node(struct device_node *dn)
 {
-#ifdef CONFIG_PROC_DEVICETREE
-        struct proc_dir_entry *ent;
-#endif
         int rc;
 
         of_node_set_flag(dn, OF_DYNAMIC);
@@ -266,44 +262,26 @@ int dlpar_attach_node(struct device_node *dn)
         if (!dn->parent)
                 return -ENOMEM;
 
-        rc = pSeries_reconfig_notify(PSERIES_RECONFIG_ADD, dn);
+        rc = of_attach_node(dn);
         if (rc) {
                 printk(KERN_ERR "Failed to add device node %s\n",
                        dn->full_name);
                 return rc;
         }
 
-        of_attach_node(dn);
-
-#ifdef CONFIG_PROC_DEVICETREE
-        ent = proc_mkdir(strrchr(dn->full_name, '/') + 1, dn->parent->pde);
-        if (ent)
-                proc_device_tree_add_node(dn, ent);
-#endif
-
         of_node_put(dn->parent);
         return 0;
 }
 
 int dlpar_detach_node(struct device_node *dn)
 {
-#ifdef CONFIG_PROC_DEVICETREE
-        struct device_node *parent = dn->parent;
-        struct property *prop = dn->properties;
-
-        while (prop) {
-                remove_proc_entry(prop->name, dn->pde);
-                prop = prop->next;
-        }
+        int rc;
 
-        if (dn->pde)
-                remove_proc_entry(dn->pde->name, parent->pde);
-#endif
+        rc = of_detach_node(dn);
+        if (rc)
+                return rc;
 
-        pSeries_reconfig_notify(PSERIES_RECONFIG_REMOVE, dn);
-        of_detach_node(dn);
         of_node_put(dn); /* Must decrement the refcount */
-
         return 0;
 }
 
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index 64c97d8ac0c5..a38956269fbf 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -23,12 +23,12 @@
 #include <linux/delay.h>
 #include <linux/sched.h>        /* for idle_task_exit */
 #include <linux/cpu.h>
+#include <linux/of.h>
 #include <asm/prom.h>
 #include <asm/rtas.h>
 #include <asm/firmware.h>
 #include <asm/machdep.h>
 #include <asm/vdso_datapage.h>
-#include <asm/pSeries_reconfig.h>
 #include <asm/xics.h>
 #include "plpar_wrappers.h"
 #include "offline_states.h"
@@ -333,10 +333,10 @@ static int pseries_smp_notifier(struct notifier_block *nb,
         int err = 0;
 
         switch (action) {
-        case PSERIES_RECONFIG_ADD:
+        case OF_RECONFIG_ATTACH_NODE:
                 err = pseries_add_processor(node);
                 break;
-        case PSERIES_RECONFIG_REMOVE:
+        case OF_RECONFIG_DETACH_NODE:
                 pseries_remove_processor(node);
                 break;
         }
@@ -399,7 +399,7 @@ static int __init pseries_cpu_hotplug_init(void)
 
         /* Processors can be added/removed only on LPAR */
         if (firmware_has_feature(FW_FEATURE_LPAR)) {
-                pSeries_reconfig_notifier_register(&pseries_smp_nb);
+                of_reconfig_notifier_register(&pseries_smp_nb);
                 cpu_maps_update_begin();
                 if (cede_offline_enabled && parse_cede_parameters() == 0) {
                         default_offline_state = CPU_STATE_INACTIVE;
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index ecdb0a6b3171..2372c609fa2b 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -16,7 +16,6 @@
 
 #include <asm/firmware.h>
 #include <asm/machdep.h>
-#include <asm/pSeries_reconfig.h>
 #include <asm/sparsemem.h>
 
 static unsigned long get_memblock_size(void)
@@ -187,42 +186,69 @@ static int pseries_add_memory(struct device_node *np)
         return (ret < 0) ? -EINVAL : 0;
 }
 
-static int pseries_drconf_memory(unsigned long *base, unsigned int action)
+static int pseries_update_drconf_memory(struct of_prop_reconfig *pr)
 {
+        struct of_drconf_cell *new_drmem, *old_drmem;
         unsigned long memblock_size;
-        int rc;
+        u32 entries;
+        u32 *p;
+        int i, rc = -EINVAL;
 
         memblock_size = get_memblock_size();
         if (!memblock_size)
                 return -EINVAL;
 
-        if (action == PSERIES_DRCONF_MEM_ADD) {
-                rc = memblock_add(*base, memblock_size);
-                rc = (rc < 0) ? -EINVAL : 0;
-        } else if (action == PSERIES_DRCONF_MEM_REMOVE) {
-                rc = pseries_remove_memblock(*base, memblock_size);
-        } else {
-                rc = -EINVAL;
+        p = (u32 *)of_get_property(pr->dn, "ibm,dynamic-memory", NULL);
+        if (!p)
+                return -EINVAL;
+
+        /* The first int of the property is the number of lmb's described
+         * by the property. This is followed by an array of of_drconf_cell
+         * entries. Get the niumber of entries and skip to the array of
+         * of_drconf_cell's.
+         */
+        entries = *p++;
+        old_drmem = (struct of_drconf_cell *)p;
+
+        p = (u32 *)pr->prop->value;
+        p++;
+        new_drmem = (struct of_drconf_cell *)p;
+
+        for (i = 0; i < entries; i++) {
+                if ((old_drmem[i].flags & DRCONF_MEM_ASSIGNED) &&
+                    (!(new_drmem[i].flags & DRCONF_MEM_ASSIGNED))) {
+                        rc = pseries_remove_memblock(old_drmem[i].base_addr,
+                                                     memblock_size);
+                        break;
+                } else if ((!(old_drmem[i].flags & DRCONF_MEM_ASSIGNED)) &&
+                           (new_drmem[i].flags & DRCONF_MEM_ASSIGNED)) {
+                        rc = memblock_add(old_drmem[i].base_addr,
+                                          memblock_size);
+                        rc = (rc < 0) ? -EINVAL : 0;
+                        break;
+                }
         }
 
         return rc;
 }
 
 static int pseries_memory_notifier(struct notifier_block *nb,
-                                unsigned long action, void *node)
+                                   unsigned long action, void *node)
 {
+        struct of_prop_reconfig *pr;
         int err = 0;
 
         switch (action) {
-        case PSERIES_RECONFIG_ADD:
+        case OF_RECONFIG_ATTACH_NODE:
                 err = pseries_add_memory(node);
                 break;
-        case PSERIES_RECONFIG_REMOVE:
+        case OF_RECONFIG_DETACH_NODE:
                 err = pseries_remove_memory(node);
                 break;
-        case PSERIES_DRCONF_MEM_ADD:
-        case PSERIES_DRCONF_MEM_REMOVE:
-                err = pseries_drconf_memory(node, action);
+        case OF_RECONFIG_UPDATE_PROPERTY:
+                pr = (struct of_prop_reconfig *)node;
+                if (!strcmp(pr->prop->name, "ibm,dynamic-memory"))
+                        err = pseries_update_drconf_memory(pr);
                 break;
         }
         return notifier_from_errno(err);
@@ -235,7 +261,7 @@ static struct notifier_block pseries_mem_nb = {
 static int __init pseries_memory_hotplug_init(void)
 {
         if (firmware_has_feature(FW_FEATURE_LPAR))
-                pSeries_reconfig_notifier_register(&pseries_mem_nb);
+                of_reconfig_notifier_register(&pseries_mem_nb);
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 6153eea27ce7..e2685badb5db 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -36,13 +36,13 @@
 #include <linux/dma-mapping.h>
 #include <linux/crash_dump.h>
 #include <linux/memory.h>
+#include <linux/of.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/rtas.h>
 #include <asm/iommu.h>
 #include <asm/pci-bridge.h>
 #include <asm/machdep.h>
-#include <asm/pSeries_reconfig.h>
 #include <asm/firmware.h>
 #include <asm/tce.h>
 #include <asm/ppc-pci.h>
@@ -760,7 +760,7 @@ static void remove_ddw(struct device_node *np)
         __remove_ddw(np, ddw_avail, liobn);
 
 delprop:
-        ret = prom_remove_property(np, win64);
+        ret = of_remove_property(np, win64);
         if (ret)
                 pr_warning("%s: failed to remove direct window property: %d\n",
                         np->full_name, ret);
@@ -1070,7 +1070,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)
                 goto out_free_window;
         }
 
-        ret = prom_add_property(pdn, win64);
+        ret = of_add_property(pdn, win64);
         if (ret) {
                 dev_err(&dev->dev, "unable to add dma window property for %s: %d",
                          pdn->full_name, ret);
@@ -1294,7 +1294,7 @@ static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long acti
         struct direct_window *window;
 
         switch (action) {
-        case PSERIES_RECONFIG_REMOVE:
+        case OF_RECONFIG_DETACH_NODE:
                 if (pci && pci->iommu_table)
                         iommu_free_table(pci->iommu_table, np->full_name);
 
@@ -1357,7 +1357,7 @@ void iommu_init_early_pSeries(void)
         }
 
 
-        pSeries_reconfig_notifier_register(&iommu_reconfig_nb);
+        of_reconfig_notifier_register(&iommu_reconfig_nb);
         register_memory_notifier(&iommu_mem_nb);
 
         set_pci_dma_ops(&dma_iommu_ops);
diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c
index dd30b12edfe4..6573808cc5f3 100644
--- a/arch/powerpc/platforms/pseries/mobility.c
+++ b/arch/powerpc/platforms/pseries/mobility.c
@@ -116,7 +116,7 @@ static int update_dt_property(struct device_node *dn, struct property **prop,
         }
 
         if (!more) {
-                prom_update_property(dn, new_prop);
+                of_update_property(dn, new_prop);
                 new_prop = NULL;
         }
 
@@ -172,7 +172,7 @@ static int update_dt_node(u32 phandle)
 
                         case 0x80000000:
                                 prop = of_find_property(dn, prop_name, NULL);
-                                prom_remove_property(dn, prop);
+                                of_remove_property(dn, prop);
                                 prop = NULL;
                                 break;
 
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index 39f71fba9b38..30b358dc2beb 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -16,55 +16,13 @@
 #include <linux/notifier.h>
 #include <linux/proc_fs.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 
 #include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/uaccess.h>
-#include <asm/pSeries_reconfig.h>
 #include <asm/mmu.h>
 
-
-
-/*
- * Routines for "runtime" addition and removal of device tree nodes.
- */
-#ifdef CONFIG_PROC_DEVICETREE
-/*
- * Add a node to /proc/device-tree.
- */
-static void add_node_proc_entries(struct device_node *np)
-{
-        struct proc_dir_entry *ent;
-
-        ent = proc_mkdir(strrchr(np->full_name, '/') + 1, np->parent->pde);
-        if (ent)
-                proc_device_tree_add_node(np, ent);
-}
-
-static void remove_node_proc_entries(struct device_node *np)
-{
-        struct property *pp = np->properties;
-        struct device_node *parent = np->parent;
-
-        while (pp) {
-                remove_proc_entry(pp->name, np->pde);
-                pp = pp->next;
-        }
-        if (np->pde)
-                remove_proc_entry(np->pde->name, parent->pde);
-}
-#else /* !CONFIG_PROC_DEVICETREE */
-static void add_node_proc_entries(struct device_node *np)
-{
-        return;
-}
-
-static void remove_node_proc_entries(struct device_node *np)
-{
-        return;
-}
-#endif /* CONFIG_PROC_DEVICETREE */
-
 /**
  *      derive_parent - basically like dirname(1)
  *      @path:  the full_name of a node to be added to the tree
@@ -97,28 +55,6 @@ static struct device_node *derive_parent(const char *path)
         return parent;
 }
 
-static BLOCKING_NOTIFIER_HEAD(pSeries_reconfig_chain);
-
-int pSeries_reconfig_notifier_register(struct notifier_block *nb)
-{
-        return blocking_notifier_chain_register(&pSeries_reconfig_chain, nb);
-}
-EXPORT_SYMBOL_GPL(pSeries_reconfig_notifier_register);
-
-void pSeries_reconfig_notifier_unregister(struct notifier_block *nb)
-{
-        blocking_notifier_chain_unregister(&pSeries_reconfig_chain, nb);
-}
-EXPORT_SYMBOL_GPL(pSeries_reconfig_notifier_unregister);
-
-int pSeries_reconfig_notify(unsigned long action, void *p)
-{
-        int err = blocking_notifier_call_chain(&pSeries_reconfig_chain,
-                                                action, p);
-
-        return notifier_to_errno(err);
-}
-
 static int pSeries_reconfig_add_node(const char *path, struct property *proplist)
 {
         struct device_node *np;
@@ -142,16 +78,12 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist
                 goto out_err;
         }
 
-        err = pSeries_reconfig_notify(PSERIES_RECONFIG_ADD, np);
+        err = of_attach_node(np);
         if (err) {
                 printk(KERN_ERR "Failed to add device node %s\n", path);
                 goto out_err;
         }
 
-        of_attach_node(np);
-
-        add_node_proc_entries(np);
-
         of_node_put(np->parent);
 
         return 0;
@@ -179,11 +111,7 @@ static int pSeries_reconfig_remove_node(struct device_node *np)
                 return -EBUSY;
         }
 
-        remove_node_proc_entries(np);
-
-        pSeries_reconfig_notify(PSERIES_RECONFIG_REMOVE, np);
         of_detach_node(np);
-
         of_node_put(parent);
         of_node_put(np); /* Must decrement the refcount */
         return 0;
@@ -398,7 +326,7 @@ static int do_add_property(char *buf, size_t bufsize)
         if (!prop)
                 return -ENOMEM;
 
-        prom_add_property(np, prop);
+        of_add_property(np, prop);
 
         return 0;
 }
@@ -422,16 +350,15 @@ static int do_remove_property(char *buf, size_t bufsize)
 
         prop = of_find_property(np, buf, NULL);
 
-        return prom_remove_property(np, prop);
+        return of_remove_property(np, prop);
 }
 
 static int do_update_property(char *buf, size_t bufsize)
 {
         struct device_node *np;
-        struct pSeries_reconfig_prop_update upd_value;
         unsigned char *value;
         char *name, *end, *next_prop;
-        int rc, length;
+        int length;
         struct property *newprop;
         buf = parse_node(buf, bufsize, &np);
         end = buf + bufsize;
@@ -453,41 +380,7 @@ static int do_update_property(char *buf, size_t bufsize)
         if (!strcmp(name, "slb-size") || !strcmp(name, "ibm,slb-size"))
                 slb_set_size(*(int *)value);
 
-        upd_value.node = np;
-        upd_value.property = newprop;
-        pSeries_reconfig_notify(PSERIES_UPDATE_PROPERTY, &upd_value);
-
-        rc = prom_update_property(np, newprop);
-        if (rc)
-                return rc;
-
-        /* For memory under the ibm,dynamic-reconfiguration-memory node
-         * of the device tree, adding and removing memory is just an update
-         * to the ibm,dynamic-memory property instead of adding/removing a
-         * memory node in the device tree.  For these cases we still need to
-         * involve the notifier chain.
-         */
-        if (!strcmp(name, "ibm,dynamic-memory")) {
-                int action;
-
-                next_prop = parse_next_property(next_prop, end, &name,
-                                                &length, &value);
-                if (!next_prop)
-                        return -EINVAL;
-
-                if (!strcmp(name, "add"))
-                        action = PSERIES_DRCONF_MEM_ADD;
-                else
-                        action = PSERIES_DRCONF_MEM_REMOVE;
-
-                rc = pSeries_reconfig_notify(action, value);
-                if (rc) {
-                        prom_update_property(np, newprop);
-                        return rc;
-                }
-        }
-
-        return 0;
+        return of_update_property(np, newprop);
 }
 
 /**
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index e3cb7ae61658..e1a5b8a32d25 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -40,6 +40,7 @@
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/cpuidle.h>
+#include <linux/of.h>
 
 #include <asm/mmu.h>
 #include <asm/processor.h>
@@ -63,7 +64,6 @@
 #include <asm/smp.h>
 #include <asm/firmware.h>
 #include <asm/eeh.h>
-#include <asm/pSeries_reconfig.h>
 
 #include "plpar_wrappers.h"
 #include "pseries.h"
@@ -258,7 +258,7 @@ static int pci_dn_reconfig_notifier(struct notifier_block *nb, unsigned long act
         int err = NOTIFY_OK;
 
         switch (action) {
-        case PSERIES_RECONFIG_ADD:
+        case OF_RECONFIG_ATTACH_NODE:
                 pci = np->parent->data;
                 if (pci) {
                         update_dn_pci_info(np, pci->phb);
@@ -389,7 +389,7 @@ static void __init pSeries_setup_arch(void)
         /* Find and initialize PCI host bridges */
         init_pci_config_tokens();
         find_and_init_phbs();
-        pSeries_reconfig_notifier_register(&pci_dn_reconfig_nb);
+        of_reconfig_notifier_register(&pci_dn_reconfig_nb);
 
         pSeries_nvram_init();
 
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index 71706bc34a0d..9fc0a4941908 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -38,7 +38,6 @@
 #include <asm/cputable.h>
 #include <asm/firmware.h>
 #include <asm/rtas.h>
-#include <asm/pSeries_reconfig.h>
 #include <asm/mpic.h>
 #include <asm/vdso_datapage.h>
 #include <asm/cputhreads.h>
diff --git a/drivers/crypto/nx/nx-842.c b/drivers/crypto/nx/nx-842.c
index 0ce625738677..6c4c000671c5 100644
--- a/drivers/crypto/nx/nx-842.c
+++ b/drivers/crypto/nx/nx-842.c
@@ -28,7 +28,6 @@
 #include <linux/slab.h>
 
 #include <asm/page.h>
-#include <asm/pSeries_reconfig.h>
 #include <asm/vio.h>
 
 #include "nx_csbcpb.h" /* struct nx_csbcpb */
@@ -1014,26 +1013,23 @@ error_out:
  *      NOTIFY_BAD encoded with error number on failure, use
  *              notifier_to_errno() to decode this value
  */
-static int nx842_OF_notifier(struct notifier_block *np,
-                                        unsigned long action,
-                                        void *update)
+static int nx842_OF_notifier(struct notifier_block *np, unsigned long action,
+                             void *update)
 {
-        struct pSeries_reconfig_prop_update *upd;
+        struct of_prop_reconfig *upd = update;
         struct nx842_devdata *local_devdata;
         struct device_node *node = NULL;
 
-        upd = (struct pSeries_reconfig_prop_update *)update;
-
         rcu_read_lock();
         local_devdata = rcu_dereference(devdata);
         if (local_devdata)
                 node = local_devdata->dev->of_node;
 
         if (local_devdata &&
-                        action == PSERIES_UPDATE_PROPERTY &&
-                        !strcmp(upd->node->name, node->name)) {
+                        action == OF_RECONFIG_UPDATE_PROPERTY &&
+                        !strcmp(upd->dn->name, node->name)) {
                 rcu_read_unlock();
-                nx842_OF_upd(upd->property);
+                nx842_OF_upd(upd->prop);
         } else
                 rcu_read_unlock();
 
@@ -1182,7 +1178,7 @@ static int __init nx842_probe(struct vio_dev *viodev,
         synchronize_rcu();
         kfree(old_devdata);
 
-        pSeries_reconfig_notifier_register(&nx842_of_nb);
+        of_reconfig_notifier_register(&nx842_of_nb);
 
         ret = nx842_OF_upd(NULL);
         if (ret && ret != -ENODEV) {
@@ -1228,7 +1224,7 @@ static int __exit nx842_remove(struct vio_dev *viodev)
         spin_lock_irqsave(&devdata_mutex, flags);
         old_devdata = rcu_dereference_check(devdata,
                         lockdep_is_held(&devdata_mutex));
-        pSeries_reconfig_notifier_unregister(&nx842_of_nb);
+        of_reconfig_notifier_unregister(&nx842_of_nb);
         rcu_assign_pointer(devdata, NULL);
         spin_unlock_irqrestore(&devdata_mutex, flags);
         synchronize_rcu();
diff --git a/drivers/crypto/nx/nx.c b/drivers/crypto/nx/nx.c
index 638110efae9b..f7a8a16aa7d3 100644
--- a/drivers/crypto/nx/nx.c
+++ b/drivers/crypto/nx/nx.c
@@ -33,7 +33,6 @@
 #include <linux/scatterlist.h>
 #include <linux/device.h>
 #include <linux/of.h>
-#include <asm/pSeries_reconfig.h>
 #include <asm/hvcall.h>
 #include <asm/vio.h>
 
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 7d5a6b40b31c..5b939509db3b 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -997,7 +997,7 @@ static struct smu_sdbp_header *smu_create_sdb_partition(int id)
                        "%02x !\n", id, hdr->id);
                 goto failure;
         }
-        if (prom_add_property(smu->of_node, prop)) {
+        if (of_add_property(smu->of_node, prop)) {
                 printk(KERN_DEBUG "SMU: Failed creating sdb-partition-%02x "
                        "property !\n", id);
                 goto failure;
diff --git a/drivers/of/base.c b/drivers/of/base.c
index af3b22ac7627..02d94c4ea83c 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1028,13 +1028,36 @@ int of_parse_phandle_with_args(struct device_node *np, const char *list_name,
 }
 EXPORT_SYMBOL(of_parse_phandle_with_args);
 
+#if defined(CONFIG_OF_DYNAMIC)
+static int of_property_notify(int action, struct device_node *np,
+                              struct property *prop)
+{
+        struct of_prop_reconfig pr;
+
+        pr.dn = np;
+        pr.prop = prop;
+        return of_reconfig_notify(action, &pr);
+}
+#else
+static int of_property_notify(int action, struct device_node *np,
+                              struct property *prop)
+{
+        return 0;
+}
+#endif
+
 /**
- * prom_add_property - Add a property to a node
+ * of_add_property - Add a property to a node
  */
-int prom_add_property(struct device_node *np, struct property *prop)
+int of_add_property(struct device_node *np, struct property *prop)
 {
         struct property **next;
         unsigned long flags;
+        int rc;
+
+        rc = of_property_notify(OF_RECONFIG_ADD_PROPERTY, np, prop);
+        if (rc)
+                return rc;
 
         prop->next = NULL;
         write_lock_irqsave(&devtree_lock, flags);
@@ -1060,18 +1083,23 @@ int prom_add_property(struct device_node *np, struct property *prop)
 }
 
 /**
- * prom_remove_property - Remove a property from a node.
+ * of_remove_property - Remove a property from a node.
  *
  * Note that we don't actually remove it, since we have given out
  * who-knows-how-many pointers to the data using get-property.
  * Instead we just move the property to the "dead properties"
  * list, so it won't be found any more.
  */
-int prom_remove_property(struct device_node *np, struct property *prop)
+int of_remove_property(struct device_node *np, struct property *prop)
 {
         struct property **next;
         unsigned long flags;
         int found = 0;
+        int rc;
+
+        rc = of_property_notify(OF_RECONFIG_REMOVE_PROPERTY, np, prop);
+        if (rc)
+                return rc;
 
         write_lock_irqsave(&devtree_lock, flags);
         next = &np->properties;
@@ -1101,7 +1129,7 @@ int prom_remove_property(struct device_node *np, struct property *prop)
 }
 
 /*
- * prom_update_property - Update a property in a node, if the property does
+ * of_update_property - Update a property in a node, if the property does
  * not exist, add it.
  *
  * Note that we don't actually remove it, since we have given out
@@ -1109,19 +1137,22 @@ int prom_remove_property(struct device_node *np, struct property *prop)
  * Instead we just move the property to the "dead properties" list,
  * and add the new property to the property list
  */
-int prom_update_property(struct device_node *np,
-                         struct property *newprop)
+int of_update_property(struct device_node *np, struct property *newprop)
 {
         struct property **next, *oldprop;
         unsigned long flags;
-        int found = 0;
+        int rc, found = 0;
+
+        rc = of_property_notify(OF_RECONFIG_UPDATE_PROPERTY, np, newprop);
+        if (rc)
+                return rc;
 
         if (!newprop->name)
                 return -EINVAL;
 
         oldprop = of_find_property(np, newprop->name, NULL);
         if (!oldprop)
-                return prom_add_property(np, newprop);
+                return of_add_property(np, newprop);
 
         write_lock_irqsave(&devtree_lock, flags);
         next = &np->properties;
@@ -1160,12 +1191,53 @@ int prom_update_property(struct device_node *np,
  * device tree nodes.
  */
 
+static BLOCKING_NOTIFIER_HEAD(of_reconfig_chain);
+
+int of_reconfig_notifier_register(struct notifier_block *nb)
+{
+        return blocking_notifier_chain_register(&of_reconfig_chain, nb);
+}
+
+int of_reconfig_notifier_unregister(struct notifier_block *nb)
+{
+        return blocking_notifier_chain_unregister(&of_reconfig_chain, nb);
+}
+
+int of_reconfig_notify(unsigned long action, void *p)
+{
+        int rc;
+
+        rc = blocking_notifier_call_chain(&of_reconfig_chain, action, p);
+        return notifier_to_errno(rc);
+}
+
+#ifdef CONFIG_PROC_DEVICETREE
+static void of_add_proc_dt_entry(struct device_node *dn)
+{
+        struct proc_dir_entry *ent;
+
+        ent = proc_mkdir(strrchr(dn->full_name, '/') + 1, dn->parent->pde);
+        if (ent)
+                proc_device_tree_add_node(dn, ent);
+}
+#else
+static void of_add_proc_dt_entry(struct device_node *dn)
+{
+        return;
+}
+#endif
+
 /**
  * of_attach_node - Plug a device node into the tree and global list.
  */
-void of_attach_node(struct device_node *np)
+int of_attach_node(struct device_node *np)
 {
         unsigned long flags;
+        int rc;
+
+        rc = of_reconfig_notify(OF_RECONFIG_ATTACH_NODE, np);
+        if (rc)
+                return rc;
 
         write_lock_irqsave(&devtree_lock, flags);
         np->sibling = np->parent->child;
@@ -1173,24 +1245,61 @@ void of_attach_node(struct device_node *np)
         np->parent->child = np;
         allnodes = np;
         write_unlock_irqrestore(&devtree_lock, flags);
+
+        of_add_proc_dt_entry(np);
+        return 0;
 }
 
+#ifdef CONFIG_PROC_DEVICETREE
+static void of_remove_proc_dt_entry(struct device_node *dn)
+{
+        struct device_node *parent = dn->parent;
+        struct property *prop = dn->properties;
+
+        while (prop) {
+                remove_proc_entry(prop->name, dn->pde);
+                prop = prop->next;
+        }
+
+        if (dn->pde)
+                remove_proc_entry(dn->pde->name, parent->pde);
+}
+#else
+static void of_remove_proc_dt_entry(struct device_node *dn)
+{
+        return;
+}
+#endif
+
 /**
  * of_detach_node - "Unplug" a node from the device tree.
  *
  * The caller must hold a reference to the node.  The memory associated with
  * the node is not freed until its refcount goes to zero.
  */
-void of_detach_node(struct device_node *np)
+int of_detach_node(struct device_node *np)
 {
         struct device_node *parent;
         unsigned long flags;
+        int rc = 0;
+
+        rc = of_reconfig_notify(OF_RECONFIG_DETACH_NODE, np);
+        if (rc)
+                return rc;
 
         write_lock_irqsave(&devtree_lock, flags);
 
+        if (of_node_check_flag(np, OF_DETACHED)) {
+                /* someone already detached it */
+                write_unlock_irqrestore(&devtree_lock, flags);
+                return rc;
+        }
+
         parent = np->parent;
-        if (!parent)
-                goto out_unlock;
+        if (!parent) {
+                write_unlock_irqrestore(&devtree_lock, flags);
+                return rc;
+        }
 
         if (allnodes == np)
                 allnodes = np->allnext;
@@ -1215,9 +1324,10 @@ void of_detach_node(struct device_node *np)
         }
 
         of_node_set_flag(np, OF_DETACHED);
-
-out_unlock:
         write_unlock_irqrestore(&devtree_lock, flags);
+
+        of_remove_proc_dt_entry(np);
+        return rc;
 }
 #endif /* defined(CONFIG_OF_DYNAMIC) */
 
diff --git a/include/linux/of.h b/include/linux/of.h
index 72843b72a2b2..a093b2fe5dfb 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -22,6 +22,7 @@
 #include <linux/mod_devicetable.h>
 #include <linux/spinlock.h>
 #include <linux/topology.h>
+#include <linux/notifier.h>
 
 #include <asm/byteorder.h>
 #include <asm/errno.h>
@@ -267,16 +268,28 @@ extern int of_alias_get_id(struct device_node *np, const char *stem);
 
 extern int of_machine_is_compatible(const char *compat);
 
-extern int prom_add_property(struct device_node* np, struct property* prop);
-extern int prom_remove_property(struct device_node *np, struct property *prop);
-extern int prom_update_property(struct device_node *np,
-                                struct property *newprop);
+extern int of_add_property(struct device_node *np, struct property *prop);
+extern int of_remove_property(struct device_node *np, struct property *prop);
+extern int of_update_property(struct device_node *np, struct property *newprop);
 
-#if defined(CONFIG_OF_DYNAMIC)
 /* For updating the device tree at runtime */
-extern void of_attach_node(struct device_node *);
-extern void of_detach_node(struct device_node *);
-#endif
+#define OF_RECONFIG_ATTACH_NODE         0x0001
+#define OF_RECONFIG_DETACH_NODE         0x0002
+#define OF_RECONFIG_ADD_PROPERTY        0x0003
+#define OF_RECONFIG_REMOVE_PROPERTY     0x0004
+#define OF_RECONFIG_UPDATE_PROPERTY     0x0005
+
+struct of_prop_reconfig {
+        struct device_node      *dn;
+        struct property         *prop;
+};
+
+extern int of_reconfig_notifier_register(struct notifier_block *);
+extern int of_reconfig_notifier_unregister(struct notifier_block *);
+extern int of_reconfig_notify(unsigned long, void *);
+
+extern int of_attach_node(struct device_node *);
+extern int of_detach_node(struct device_node *);
 
 #define of_match_ptr(_ptr)      (_ptr)