diff options
author | Wolfgang Denk <wd@denx.de> | 2009-02-07 23:51:52 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-02-07 23:51:52 +0100 |
commit | f8306cb94f59ae2ace5bfede189944d329e5abb3 (patch) | |
tree | c26c402b9d1c3d28f5a54ffd4fcd2f3a393772de /cpu/ppc4xx/fdt.c | |
parent | 657f2062d8e17ebf4a55f52c9e71c07c0c94c779 (diff) | |
parent | 2d43e873a29ca4959ba6a30fc7fb396d3fd0dccf (diff) | |
download | u-boot-imx-f8306cb94f59ae2ace5bfede189944d329e5abb3.zip u-boot-imx-f8306cb94f59ae2ace5bfede189944d329e5abb3.tar.gz u-boot-imx-f8306cb94f59ae2ace5bfede189944d329e5abb3.tar.bz2 |
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Diffstat (limited to 'cpu/ppc4xx/fdt.c')
-rw-r--r-- | cpu/ppc4xx/fdt.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/cpu/ppc4xx/fdt.c b/cpu/ppc4xx/fdt.c index c55e1cf..ba5c120 100644 --- a/cpu/ppc4xx/fdt.c +++ b/cpu/ppc4xx/fdt.c @@ -113,6 +113,7 @@ void fdt_pcie_setup(void *blob) void ft_cpu_setup(void *blob, bd_t *bd) { sys_info_t sys_info; + int off, ndepth = 0; get_sys_info(&sys_info); @@ -133,9 +134,28 @@ void ft_cpu_setup(void *blob, bd_t *bd) fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); /* - * Setup all baudrates for the UARTs + * Fixup all UART clocks for CPU internal UARTs + * (only these UARTs are definitely clocked by gd->uart_clk) + * + * These UARTs are direct childs of /plb/opb. This code + * does not touch any UARTs that are connected to the ebc. */ - do_fixup_by_compat_u32(blob, "ns16550", "clock-frequency", gd->uart_clk, 1); + off = fdt_path_offset(blob, "/plb/opb"); + while ((off = fdt_next_node(blob, off, &ndepth)) >= 0) { + /* + * process all sub nodes and stop when we are back + * at the starting depth + */ + if (ndepth <= 0) + break; + + /* only update direct childs */ + if ((ndepth == 1) && + (fdt_node_check_compatible(blob, off, "ns16550") == 0)) + fdt_setprop(blob, off, + "clock-frequency", + (void*)&(gd->uart_clk), 4); + } /* * Fixup all ethernet nodes |