powerpc/prom_init: Generate "phandle" instead of "linux, phandle"

When creating the boot-time FDT from an actual Open Firmware live
tree, let's generate "phandle" properties for the phandles instead
of the old deprecated "linux,phandle".

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
[mpe: Unsplit warning printf()]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 88d621a7bf672b5cd2d162a055385e8ad4993f9a..f33ff4163a51c2367661f2ce093c271c3f301b8b 100644 (file)
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -2410,14 +2410,11 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start,
                        has_phandle = 1;
        }
 
-       /* Add a "linux,phandle" property if no "phandle" property already
-        * existed.
-        */
+       /* Add a "phandle" property if none already exist */
        if (!has_phandle) {
-               soff = dt_find_string("linux,phandle");
+               soff = dt_find_string("phandle");
                if (soff == 0)
-                       prom_printf("WARNING: Can't find string index for"
-                                   " <linux-phandle> node %s\n", path);
+                       prom_printf("WARNING: Can't find string index for <phandle> node %s\n", path);
                else {
                        dt_push_token(OF_DT_PROP, mem_start, mem_end);
                        dt_push_token(4, mem_start, mem_end);
@@ -2477,9 +2474,9 @@ static void __init flatten_device_tree(void)
        dt_string_start = mem_start;
        mem_start += 4; /* hole */
 
-       /* Add "linux,phandle" in there, we'll need it */
+       /* Add "phandle" in there, we'll need it */
        namep = make_room(&mem_start, &mem_end, 16, 1);
-       strcpy(namep, "linux,phandle");
+       strcpy(namep, "phandle");
        mem_start = (unsigned long)namep + strlen(namep) + 1;
 
        /* Build string array */