From a2c1229c39e39d9a5ff90055d78b8de061943097 Mon Sep 17 00:00:00 2001 From: Timur Tabi Date: Tue, 20 Sep 2011 18:24:36 -0500 Subject: powerpc/85xx: use fdt_create_phandle() to create the Fman firmware phandles Function fdt_create_phandle() conveniently creates new phandle properties using both "linux,phandle" and "phandle", so it should be used by all code that wants to create a phandle. The Fman firmware code, which embeds an Fman firmware into the device tree, was creating the phandle properties manually. Instead, change it to use fdt_create_phandle(). Signed-off-by: Timur Tabi --- arch/powerpc/cpu/mpc85xx/fdt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index d20c94c0f7..9d2d76956e 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -504,9 +504,8 @@ void fdt_fixup_fman_firmware(void *blob) fdt_strerror(rc)); return; } - phandle = fdt_alloc_phandle(blob); - rc = fdt_setprop_cell(blob, fwnode, "linux,phandle", phandle); - if (rc < 0) { + phandle = fdt_create_phandle(blob, fwnode); + if (!phandle) { char s[64]; fdt_get_path(blob, fwnode, s, sizeof(s)); printf("Could not add phandle property to node %s: %s\n", s, -- cgit v1.2.1