Replace fdt_node_offset() with fdt_find_node_by_path().
PATCH 1/3 Replace fdt_node_offset() with fdt_find_node_by_path().
The new name matches more closely the kernel's name, which is also a much better description.
Signed-off-by Wolfgang Grandegger <[email protected]>
Acked-by Gerald Van Baren <[email protected]>
---
Patch previously published by WolfgangG with a minor update to fix a merge conflict.
board/mpc8360emds/mpc8360emds.c | 2 +- board/mpc8360emds/pci.c | 2 +- common/cmd_fdt.c | 2 +- common/fdt_support.c | 10 +++++----- cpu/mpc83xx/cpu.c | 2 +- include/libfdt.h | 2 +- libfdt/fdt_ro.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-)
board/mpc8360emds/mpc8360emds.c +1 -1
@@ -681,7 +681,7 @@ ft_board_setup(void *blob, bd_t *bd)int nodeoffset;int tmp[2 ]; - nodeoffset =fdt_path_offset (fdt,"/memory" ); + nodeoffset =fdt_find_node_by_path (fdt,"/memory" );if (nodeoffset >=0 ) { tmp[0 ] =cpu_to_be32 (bd->bi_memstart); tmp[1 ] =cpu_to_be32 (bd->bi_memsize);
board/mpc8360emds/pci.c +1 -1
@@ -311,7 +311,7 @@ ft_pci_setup(void *blob, bd_t *bd)int err;int tmp[2 ]; - nodeoffset =fdt_path_offset (fdt,"/" OF_SOC "/pci at 8500" ); + nodeoffset =fdt_find_node_by_path (fdt,"/" OF_SOC "/pci at 8500" );if (nodeoffset >=0 ) { tmp[0 ] =cpu_to_be32 (hose[0 ].first_busno); tmp[1 ] =cpu_to_be32 (hose[0 ].last_busno);
common/cmd_fdt.c +1 -1
@@ -59,7 +59,7 @@ static int findnodeoffset(const char *pathp)if (strcmp (pathp,"/" ) ==0 ) { nodeoffset =0 ; }else { - nodeoffset =fdt_path_offset (fdt, pathp); + nodeoffset =fdt_find_node_by_path (fdt, pathp);if (nodeoffset <0 ) {/* * Not found or something else bad happened.
common/fdt_support.c +5 -5
@@ -97,7 +97,7 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)/* * Find the "chosen" node. */ - nodeoffset =fdt_path_offset (fdt,"/chosen" ); + nodeoffset =fdt_find_node_by_path (fdt,"/chosen" );/* * If we have a "chosen" node already the "force the writing"
@@ -145,7 +145,7 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)printf ("WARNING fdt_chosen: could not set \"linux,stdout-path\" (libfdt error %s).\n" ,fdt_strerror (err));#endif - nodeoffset =fdt_path_offset (fdt,"/cpus" ); + nodeoffset =fdt_find_node_by_path (fdt,"/cpus" );if (nodeoffset >=0 ) { clock =cpu_to_be32 (bd->bi_intfreq); err =fdt_setprop (fdt, nodeoffset,"clock-frequency" , &clock,4 );
@@ -153,7 +153,7 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)printf ("WARNING fdt_chosen: could not set \"clock-frequency\" (libfdt error %s).\n" ,fdt_strerror (err)); }#ifdef OF_TBCLK - nodeoffset =fdt_path_offset (fdt,"/cpus/" OF_CPU "/timebase-frequency" ); + nodeoffset =fdt_find_node_by_path (fdt,"/cpus/" OF_CPU "/timebase-frequency" );if (nodeoffset >=0 ) { clock =cpu_to_be32 (OF_TBCLK ); err =fdt_setprop (fdt, nodeoffset,"clock-frequency" , &clock,4 );
@@ -190,7 +190,7 @@ int fdt_env(void *fdt)* See if we already have a "u-boot-env" node, delete it if so. * Then create a new empty node. */ - nodeoffset =fdt_path_offset (fdt,"/u-boot-env" ); + nodeoffset =fdt_find_node_by_path (fdt,"/u-boot-env" );if (nodeoffset >=0 ) { err =fdt_del_node (fdt, nodeoffset);if (err <0 ) {
@@ -310,7 +310,7 @@ int fdt_bd_t(void *fdt)* See if we already have a "bd_t" node, delete it if so. * Then create a new empty node. */ - nodeoffset =fdt_path_offset (fdt,"/bd_t" ); + nodeoffset =fdt_find_node_by_path (fdt,"/bd_t" );if (nodeoffset >=0 ) { err =fdt_del_node (fdt, nodeoffset);if (err <0 ) {
cpu/mpc83xx/cpu.c +1 -1
@@ -487,7 +487,7 @@ ft_cpu_setup(void *blob, bd_t *bd)int j;for (j =0 ; j < (sizeof (fixup_props) /sizeof (fixup_props[0 ])); j++) { - nodeoffset =fdt_path_offset (fdt, fixup_props[j].node); + nodeoffset =fdt_find_node_by_path (fdt, fixup_props[j].node);if (nodeoffset >=0 ) { err = fixup_props[j].set_fn (blob, nodeoffset, fixup_props[j].prop, bd);if (err <0 )
include/libfdt.h +1 -1
@@ -77,7 +77,7 @@ int fdt_subnode_offset_namelen(const void *fdt, int parentoffset, const char *name, int namelen);int fdt_subnode_offset (const void *fdt,int parentoffset,const char *name); -int fdt_path_offset (const void *fdt,const char *path); +int fdt_find_node_by_path (const void *fdt,const char *path);struct fdt_property *fdt_get_property (const void *fdt,int nodeoffset,const char *name,int *lenp);
libfdt/fdt_ro.c +1 -1
@@ -132,7 +132,7 @@ int fdt_subnode_offset(const void *fdt, int parentoffset,* Searches for the node corresponding to the given path and returns the * offset of that node. */ -int fdt_path_offset (const void *fdt,const char *path) +int fdt_find_node_by_path (const void *fdt,const char *path) {const char *end = path +strlen (path);const char *p = path;
Signature · 1 line
1.4.4.4
PATCH 1/3 Replace fdt_node_offset() with fdt_find_node_by_path().
The subject should have been [PATCH: u-boot-fdt 1/3] ... ...although it makes no material difference.
Sorry for the confusion,
gvb