From: Stefan Roese <sr@denx.de>
Date: Mon, 22 Oct 2007 08:30:38 +0000 (+0200)
Subject: ppc4xx: Correct UART input clock calculation and passing to fdt
X-Git-Tag: v1.3.2-rc1~100^2~108
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=764e7417ee5f6e25b1715720e7d7dd3487109385;p=oweals%2Fu-boot.git

ppc4xx: Correct UART input clock calculation and passing to fdt

Signed-off-by: Stefan Roese <sr@denx.de>
---

diff --git a/cpu/ppc4xx/fdt.c b/cpu/ppc4xx/fdt.c
index 44e95a5a91..bf97c2a435 100644
--- a/cpu/ppc4xx/fdt.c
+++ b/cpu/ppc4xx/fdt.c
@@ -85,11 +85,7 @@ static void do_fixup_uart(void *fdt, int offset, int i, bd_t *bd)
 
 	debug("Updating node UART%d\n", i);
 
-#if defined(CFG_EXT_SERIAL_CLOCK)
-	val = cpu_to_fdt32(CFG_EXT_SERIAL_CLOCK);
-#else
 	val = cpu_to_fdt32(sys_info.freqUART);
-#endif
 	rc = fdt_setprop(fdt, offset, "clock-frequency", &val, 4);
 	if (rc)
 		printf("Unable to update node UART, err=%s\n", fdt_strerror(rc));
diff --git a/cpu/ppc4xx/serial.c b/cpu/ppc4xx/serial.c
index 8b1e2ffa0b..0fdef7e64f 100644
--- a/cpu/ppc4xx/serial.c
+++ b/cpu/ppc4xx/serial.c
@@ -528,12 +528,18 @@ int serial_init(void)
 	udiv = 1;
 	tmp  = gd->baudrate * 16;
 	bdiv = (CFG_EXT_SERIAL_CLOCK + tmp / 2) / tmp;
+	gd->freqUART = CFG_EXT_SERIAL_CLOCK;
 #else
 	/* For 440, the cpu clock is on divider chain A, UART on divider
 	 * chain B ... so cpu clock is irrelevant. Get the "optimized"
 	 * values that are subject to the 1/2 opb clock constraint
 	 */
 	serial_divs (gd->baudrate, &udiv, &bdiv);
+
+	/* Correct UART frequency in bd-info struct now that
+	 * the UART divisor is available
+	 */
+	gd->freqUART = gd->freqUART / udiv;
 #endif
 
 	reg |= (udiv - UDIV_SUBTRACT) << CR0_UDIV_POS;	/* set the UART divisor */
@@ -644,6 +650,15 @@ int serial_init (void)
 	bdiv = (clk + tmp / 2) / tmp;
 #endif /* CONFIG_405EX */
 
+	/* Correct UART frequency in bd-info struct now that
+	 * the UART divisor is available
+	 */
+#ifdef CFG_EXT_SERIAL_CLOCK
+	gd->freqUART = CFG_EXT_SERIAL_CLOCK;
+#else
+	gd->freqUART = gd->freqUART / udiv;
+#endif
+
 	out8(UART_BASE + UART_LCR, 0x80);	/* set DLAB bit */
 	out8(UART_BASE + UART_DLL, bdiv);	/* set baudrate divisor */
 	out8(UART_BASE + UART_DLM, bdiv >> 8);	/* set baudrate divisor */