Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (408 commits)
  [POWERPC] Add memchr() to the bootwrapper
  [POWERPC] Implement logging of unhandled signals
  [POWERPC] Add legacy serial support for OPB with flattened device tree
  [POWERPC] Use 1TB segments
  [POWERPC] XilinxFB: Allow fixed framebuffer base address
  [POWERPC] XilinxFB: Add support for custom screen resolution
  [POWERPC] XilinxFB: Use pdata to pass around framebuffer parameters
  [POWERPC] PCI: Add 64-bit physical address support to setup_indirect_pci
  [POWERPC] 4xx: Kilauea defconfig file
  [POWERPC] 4xx: Kilauea DTS
  [POWERPC] 4xx: Add AMCC Kilauea eval board support to platforms/40x
  [POWERPC] 4xx: Add AMCC 405EX support to cputable.c
  [POWERPC] Adjust TASK_SIZE on ppc32 systems to 3GB that are capable
  [POWERPC] Use PAGE_OFFSET to tell if an address is user/kernel in SW TLB handlers
  [POWERPC] 85xx: Enable FP emulation in MPC8560 ADS defconfig
  [POWERPC] 85xx: Killed <asm/mpc85xx.h>
  [POWERPC] 85xx: Add cpm nodes for 8541/8555 CDS
  [POWERPC] 85xx: Convert mpc8560ads to the new CPM binding.
  [POWERPC] mpc8272ads: Remove muram from the CPM reg property.
  [POWERPC] Make clockevents work on PPC601 processors
  ...

Fixed up conflict in Documentation/powerpc/booting-without-of.txt manually.

1 files changed, 78 insertions, 22 deletions

diff --git a/arch/powerpc/boot/flatdevtree.c b/arch/powerpc/boot/flatdevtree.c
index 13761bf160c4..cf30675c6116 100644
--- a/arch/powerpc/boot/flatdevtree.c
+++ b/arch/powerpc/boot/flatdevtree.c
@@ -354,16 +354,21 @@ static void ft_put_bin(struct ft_cxt *cxt, const void *data, unsigned int sz)
         cxt->p += sza;
 }
 
-int ft_begin_node(struct ft_cxt *cxt, const char *name)
+char *ft_begin_node(struct ft_cxt *cxt, const char *name)
 {
         unsigned long nlen = strlen(name) + 1;
         unsigned long len = 8 + _ALIGN(nlen, 4);
+        char *ret;
 
         if (!ft_make_space(cxt, &cxt->p, FT_STRUCT, len))
-                return -1;
+                return NULL;
+
+        ret = cxt->p;
+
         ft_put_word(cxt, OF_DT_BEGIN_NODE);
         ft_put_bin(cxt, name, strlen(name) + 1);
-        return 0;
+
+        return ret;
 }
 
 void ft_end_node(struct ft_cxt *cxt)
@@ -625,25 +630,17 @@ void ft_end_tree(struct ft_cxt *cxt)
         bph->dt_strings_size = cpu_to_be32(ssize);
 }
 
-void *ft_find_device(struct ft_cxt *cxt, const char *srch_path)
-{
-        char *node;
-
-        /* require absolute path */
-        if (srch_path[0] != '/')
-                return NULL;
-        node = ft_find_descendent(cxt, ft_root_node(cxt), srch_path);
-        return ft_get_phandle(cxt, node);
-}
-
-void *ft_find_device_rel(struct ft_cxt *cxt, const void *top,
-                         const char *srch_path)
+void *ft_find_device(struct ft_cxt *cxt, const void *top, const char *srch_path)
 {
         char *node;
 
-        node = ft_node_ph2node(cxt, top);
-        if (node == NULL)
-                return NULL;
+        if (top) {
+                node = ft_node_ph2node(cxt, top);
+                if (node == NULL)
+                        return NULL;
+        } else {
+                node = ft_root_node(cxt);
+        }
 
         node = ft_find_descendent(cxt, node, srch_path);
         return ft_get_phandle(cxt, node);
@@ -945,7 +942,7 @@ int ft_del_prop(struct ft_cxt *cxt, const void *phandle, const char *propname)
 void *ft_create_node(struct ft_cxt *cxt, const void *parent, const char *name)
 {
         struct ft_atom atom;
-        char *p, *next;
+        char *p, *next, *ret;
         int depth = 0;
 
         if (parent) {
@@ -970,11 +967,70 @@ void *ft_create_node(struct ft_cxt *cxt, const void *parent, const char *name)
                                 break;
                         /* end of node, insert here */
                         cxt->p = p;
-                        ft_begin_node(cxt, name);
+                        ret = ft_begin_node(cxt, name);
                         ft_end_node(cxt);
-                        return p;
+                        return ft_get_phandle(cxt, ret);
                 }
                 p = next;
         }
         return NULL;
 }
+
+/* Returns the start of the path within the provided buffer, or NULL on
+ * error.
+ */
+char *ft_get_path(struct ft_cxt *cxt, const void *phandle,
+                  char *buf, int len)
+{
+        const char *path_comp[FT_MAX_DEPTH];
+        struct ft_atom atom;
+        char *p, *next, *pos;
+        int depth = 0, i;
+        void *node;
+
+        node = ft_node_ph2node(cxt, phandle);
+        if (node == NULL)
+                return NULL;
+
+        p = ft_root_node(cxt);
+
+        while ((next = ft_next(cxt, p, &atom)) != NULL) {
+                switch (atom.tag) {
+                case OF_DT_BEGIN_NODE:
+                        path_comp[depth++] = atom.name;
+                        if (p == node)
+                                goto found;
+
+                        break;
+
+                case OF_DT_END_NODE:
+                        if (--depth == 0)
+                                return NULL;
+                }
+
+                p = next;
+        }
+
+found:
+        pos = buf;
+        for (i = 1; i < depth; i++) {
+                int this_len;
+
+                if (len <= 1)
+                        return NULL;
+
+                *pos++ = '/';
+                len--;
+
+                strncpy(pos, path_comp[i], len);
+
+                if (pos[len - 1] != 0)
+                        return NULL;
+
+                this_len = strlen(pos);
+                len -= this_len;
+                pos += this_len;
+        }
+
+        return buf;
+}