From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 12/12] powerpc/prom_init: Generate "phandle" instead of "linux, phandle"
Date: Mon, 15 Oct 2018 13:50:00 +1100 [thread overview]
Message-ID: <20181015025000.4522-12-benh@kernel.crashing.org> (raw)
In-Reply-To: <20181015025000.4522-1-benh@kernel.crashing.org>
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>
---
arch/powerpc/kernel/prom_init.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 57762f19f136..64409d2ecaee 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -2407,14 +2407,12 @@ 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);
+ " <phandle> node %s\n", path);
else {
dt_push_token(OF_DT_PROP, mem_start, mem_end);
dt_push_token(4, mem_start, mem_end);
@@ -2474,9 +2472,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 */
--
2.17.1
next prev parent reply other threads:[~2018-10-15 2:58 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-15 2:49 [PATCH 01/12] powerpc/prom_init: Make of_workarounds static Benjamin Herrenschmidt
2018-10-15 2:49 ` [PATCH 02/12] powerpc/prom_init: Make "fake_elf" const Benjamin Herrenschmidt
2018-10-15 2:49 ` [PATCH 03/12] powerpc/prom_init: Make "default_colors" const Benjamin Herrenschmidt
2018-10-15 2:49 ` [PATCH 04/12] powerpc/prom_init: Replace __initdata with __prombss when applicable Benjamin Herrenschmidt
2018-10-19 2:51 ` [04/12] " Michael Ellerman
2018-10-15 2:49 ` [PATCH 05/12] powerpc/prom_init: Remove support for OPAL v2 Benjamin Herrenschmidt
2018-10-19 2:51 ` [05/12] " Michael Ellerman
2018-10-15 2:49 ` [PATCH 06/12] powerpc/prom_init: Move prom_radix_disable to __prombss Benjamin Herrenschmidt
2018-10-19 2:51 ` [06/12] " Michael Ellerman
2018-10-15 2:49 ` [PATCH 07/12] powerpc/prom_init: Move ibm_arch_vec " Benjamin Herrenschmidt
2018-10-19 2:51 ` [07/12] " Michael Ellerman
2018-10-15 2:49 ` [PATCH 08/12] powerpc/prom_init: Move const structures to __initconst Benjamin Herrenschmidt
2018-10-19 2:51 ` [08/12] " Michael Ellerman
2018-10-15 2:49 ` [PATCH 09/12] powerpc/prom_init: Move a few remaining statics to appropriate sections Benjamin Herrenschmidt
2018-10-19 2:51 ` [09/12] " Michael Ellerman
2018-10-15 2:49 ` [PATCH 10/12] powerpc/prom_init: Move __prombss to it's own section and store it in .bss Benjamin Herrenschmidt
2018-10-19 2:51 ` [10/12] " Michael Ellerman
2018-10-15 2:49 ` [PATCH 11/12] powerpc: Check prom_init for disallowed sections Benjamin Herrenschmidt
2018-10-19 2:51 ` [11/12] " Michael Ellerman
2018-10-15 2:50 ` Benjamin Herrenschmidt [this message]
2018-10-19 2:51 ` [12/12] powerpc/prom_init: Generate "phandle" instead of "linux, phandle" Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181015025000.4522-12-benh@kernel.crashing.org \
--to=benh@kernel.crashing.org \
--cc=linuxppc-dev@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).