[U-Boot-Users] [PATCH 16/17] mpc83xx: Replace fdt_node_offset() with fdt_find_node_by_path().

[U-Boot-Users] [PATCH 16/17] mpc83xx: Replace fdt_node_offset() with fdt_find_node_by_path().

[Jerry Van Baren]

The new name matches more closely the kernel's name, which is also
a much better description.

These are the mpc83xx changes made necessary by the function name change.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Acked-by: Gerald Van Baren <vanbaren@cideas.com>
---
 board/mpc8360emds/mpc8360emds.c |    2 +-
 board/mpc8360emds/pci.c         |    2 +-
 cpu/mpc83xx/cpu.c               |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Hi Kim,

These are cross-over changes to the 83xx tree.  Please review.
Because these are required companion changes to the fdt patches (or the
build will break), I would prefer you to ACK the changes (assuming they
are OK ;-) and have Wolfgang pull them from the u-boot-fdt repository.

Alternatively, you could apply them and push them through your u-boot-83xx
repo, but that would cause compilation breakage until both patch sets
are applied.

Thanks,
gvb

diff --git a/board/mpc8360emds/mpc8360emds.c b/board/mpc8360emds/mpc8360emds.c
index 562eb8b..3f87f09 100644
--- a/board/mpc8360emds/mpc8360emds.c
+++ b/board/mpc8360emds/mpc8360emds.c
@@ -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);
diff --git a/board/mpc8360emds/pci.c b/board/mpc8360emds/pci.c
index 158effe..4c7a82b 100644
--- a/board/mpc8360emds/pci.c
+++ b/board/mpc8360emds/pci.c
@@ -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);
diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c
index 841fe82..a52f98a 100644
--- a/cpu/mpc83xx/cpu.c
+++ b/cpu/mpc83xx/cpu.c
@@ -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)
-- 
1.4.4.4

[U-Boot-Users] [PATCH 16/17] mpc83xx: Replace fdt_node_offset() with fdt_find_node_by_path().

[Grant Likely]

On 7/4/07, Jerry Van Baren <gvb.uboot@gmail.com> wrote:
> The new name matches more closely the kernel's name, which is also
> a much better description.
>
> These are the mpc83xx changes made necessary by the function name change.
>
> Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
> Acked-by: Gerald Van Baren <vanbaren@cideas.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>


-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
grant.likely at secretlab.ca
(403) 399-0195

[U-Boot-Users] [PATCH 16/17] mpc83xx: Replace fdt_node_offset() with fdt_find_node_by_path().

[Kim Phillips]

On Wed, 4 Jul 2007 21:27:30 -0400
Jerry Van Baren <gvb.uboot@gmail.com> wrote:

> The new name matches more closely the kernel's name, which is also
> a much better description.
> 
> These are the mpc83xx changes made necessary by the function name change.
> 
> Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
> Acked-by: Gerald Van Baren <vanbaren@cideas.com>
> ---
>  board/mpc8360emds/mpc8360emds.c |    2 +-
>  board/mpc8360emds/pci.c         |    2 +-
>  cpu/mpc83xx/cpu.c               |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> Hi Kim,
> 
> These are cross-over changes to the 83xx tree.  Please review.
> Because these are required companion changes to the fdt patches (or the
> build will break), I would prefer you to ACK the changes (assuming they
> are OK ;-) and have Wolfgang pull them from the u-boot-fdt repository.
> 
> Alternatively, you could apply them and push them through your u-boot-83xx
> repo, but that would cause compilation breakage until both patch sets
> are applied.
> 

Hi gvb,

there were a couple of minor issues I fixed up in patches 16 & 17:

o stale CONFIG_MPC83XX_TSECx cruft

o unnecessary OF_TBCLK ifdefs (all applicable boards define it, and
linux' calibration loop doesn't exit without it)

o mutual exclusion with CONFIG_OF_FLAT_TREE

o minor whitespace inconsistencies

I decided to save time and fix them in place.  I applied them to the
mpc83xx branch on u-boot-mpc83xx.git.

The master branch of u-boot-mpc83xx.git still reflects WD's master.
Since the mpc83xx branch doesn't compile for the 8360, and since
everyone should be on u-boot-testing anyway, I merged u-boot-testing,
u-boot-fdt (minus 16 & 17), and the mpc83xx branch into the testing
branch of u-boot-mpc83xx.git.

Functionality is looking good, esp. thanks to your fixups, gvb, thanks.

So, 83xx users, please test u-boot-mpc83xx.git#testing.

Thanks,

Kim

[U-Boot-Users] [PATCH 16/17] mpc83xx: Replace fdt_node_offset() with fdt_find_node_by_path().

[Jerry Van Baren]

Kim Phillips wrote:

[snip]

> Hi gvb,
> 
> there were a couple of minor issues I fixed up in patches 16 & 17:
> 
> o stale CONFIG_MPC83XX_TSECx cruft
> 
> o unnecessary OF_TBCLK ifdefs (all applicable boards define it, and
> linux' calibration loop doesn't exit without it)
> 
> o mutual exclusion with CONFIG_OF_FLAT_TREE
> 
> o minor whitespace inconsistencies
> 
> I decided to save time and fix them in place.  I applied them to the
> mpc83xx branch on u-boot-mpc83xx.git.

Excellent!

> The master branch of u-boot-mpc83xx.git still reflects WD's master.
> Since the mpc83xx branch doesn't compile for the 8360, and since
> everyone should be on u-boot-testing anyway, I merged u-boot-testing,
> u-boot-fdt (minus 16 & 17), and the mpc83xx branch into the testing
> branch of u-boot-mpc83xx.git.
> 
> Functionality is looking good, esp. thanks to your fixups, gvb, thanks.
> 
> So, 83xx users, please test u-boot-mpc83xx.git#testing.
> 
> Thanks,
> 
> Kim

Even better!  I was just debating how adventurous I would be tonight, 
whether I should try applying Jon's patchzilla on u-boot-fdt.  You just 
did it for me.  Even better.  ;-)

Thanks again,
gvb