[PATCH] fdt: don't set linux,phandle

[PATCH] fdt: don't set linux,phandle

[John Keeping]

This has been deprecated for over 10 years and everything now uses the
plain "phandle" property in preference.  There's no need to set
linux,phandle when creating phandles for nodes that do not have one.

dtc changed the default to creating just phandle in version 1.4.5
released in September 2017 with the justification that the new style had
already been supported for 7 years by that point (see dtc commit 0016f8c
("dtc: change default phandles to ePAPR style instead of both")).

Signed-off-by: John Keeping <john@metanate.com>
---

 common/fdt_support.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/common/fdt_support.c b/common/fdt_support.c
index 8662bd27a4..7e9e654204 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -1544,14 +1544,6 @@ int fdt_set_phandle(void *fdt, int nodeoffset, uint32_t phandle)
 #endif
 
 	ret = fdt_setprop_cell(fdt, nodeoffset, "phandle", phandle);
-	if (ret < 0)
-		return ret;
-
-	/*
-	 * For now, also set the deprecated "linux,phandle" property, so that we
-	 * don't break older kernels.
-	 */
-	ret = fdt_setprop_cell(fdt, nodeoffset, "linux,phandle", phandle);
 
 	return ret;
 }
-- 
2.36.0

Re: [PATCH] fdt: don't set linux,phandle

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 676 bytes --]

On Wed, Apr 20, 2022 at 11:31:11AM +0100, John Keeping wrote:

> This has been deprecated for over 10 years and everything now uses the
> plain "phandle" property in preference.  There's no need to set
> linux,phandle when creating phandles for nodes that do not have one.
> 
> dtc changed the default to creating just phandle in version 1.4.5
> released in September 2017 with the justification that the new style had
> already been supported for 7 years by that point (see dtc commit 0016f8c
> ("dtc: change default phandles to ePAPR style instead of both")).
> 
> Signed-off-by: John Keeping <john@metanate.com>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]