Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ppc4xx: Correct UART input clock calculation and passing to fdt

Browse source 
We now use a value in the gd (global data) structure for the UART input
frequency, since the PPC4xx_SYS_INFO struct is always rewritten completely
in get_sys_info().

Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese 2007-10-23 11:31:05 +02:00
parent 353f2688b4
commit f10493c6d7
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cpu/ppc4xx/4xx_uart.c
View file

@ -192,9 +192,9 @@ static void serial_init_common(u32 base, u32 udiv, u16 bdiv)
* the UART divisor is available
*/
#ifdef CFG_EXT_SERIAL_CLOCK
sys_info.freqUART = CFG_EXT_SERIAL_CLOCK;
gd->uart_clk = CFG_EXT_SERIAL_CLOCK;
#else
sys_info.freqUART = sys_info.freqUART / udiv;
gd->uart_clk = sys_info.freqUART / udiv;
#endif
out_8((u8 *)base + UART_LCR, 0x80); /* set DLAB bit */

8
cpu/ppc4xx/fdt.c
View file

@ -36,6 +36,8 @@
#include <libfdt.h>
#include <libfdt_env.h>
DECLARE_GLOBAL_DATA_PTR;
static void do_fixup(void *fdt, const char *node, const char *prop,
const void *val, int len, int create)
{
@ -44,7 +46,7 @@ static void do_fixup(void *fdt, const char *node, const char *prop,
debug("Updating property '%s/%s' = ", node, prop);
for (i = 0; i < len; i++)
debug(" %.2x", *(u8*)(val+i));
debug("\n");
debug("(%d)\n", *(u32 *)val);
#endif
int rc = fdt_find_and_setprop(fdt, node, prop, val, len, create);
if (rc)
@ -83,9 +85,9 @@ static void do_fixup_uart(void *fdt, int offset, int i, bd_t *bd)
get_sys_info(&sys_info);
debug("Updating node UART%d\n", i);
debug("Updating node UART%d: clock-frequency=%d\n", i, gd->uart_clk);
val = cpu_to_fdt32(sys_info.freqUART);
val = cpu_to_fdt32(gd->uart_clk);
rc = fdt_setprop(fdt, offset, "clock-frequency", &val, 4);
if (rc)
printf("Unable to update node UART, err=%s\n", fdt_strerror(rc));

3
include/asm-ppc/global_data.h
View file

@ -107,6 +107,9 @@ typedef struct global_data {
unsigned int dp_alloc_base;
unsigned int dp_alloc_top;
#endif
#if defined(CONFIG_4xx)
u32 uart_clk;
#endif /* CONFIG_4xx */
#if defined(CFG_GT_6426x)
unsigned int mirror_hack[16];
#endif