openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Benjamin Herrenschmidt 2018-10-15 13:50:00 +11:00 committed by Michael Ellerman
parent 2c51d97ee8
commit f1f208e54d
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/powerpc/kernel/prom_init.c
View File

@ -2410,14 +2410,11 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start,
has_phandle = 1; has_phandle = 1;
} }
/* Add a "linux,phandle" property if no "phandle" property already /* Add a "phandle" property if none already exist */
* existed.
*/
if (!has_phandle) { if (!has_phandle) {
soff = dt_find_string("linux,phandle"); soff = dt_find_string("phandle");
if (soff == 0) if (soff == 0)
prom_printf("WARNING: Can't find string index for" prom_printf("WARNING: Can't find string index for <phandle> node %s\n", path);
" <linux-phandle> node %s\n", path);
else { else {
dt_push_token(OF_DT_PROP, mem_start, mem_end); dt_push_token(OF_DT_PROP, mem_start, mem_end);
dt_push_token(4, 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; dt_string_start = mem_start;
mem_start += 4; /* hole */ 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); namep = make_room(&mem_start, &mem_end, 16, 1);
strcpy(namep, "linux,phandle"); strcpy(namep, "phandle");
mem_start = (unsigned long)namep + strlen(namep) + 1; mem_start = (unsigned long)namep + strlen(namep) + 1;
/* Build string array */ /* Build string array */