blackfin: Correct early serial mess output in BYPASS boot mode.

[J-u-boot.git] / arch / blackfin / include / asm / clock.h

diff --git a/arch/blackfin/include/asm/clock.h b/arch/blackfin/include/asm/clock.h
index df6cd68171ba75e10d6ef0d1f41d238459c72596..f1fcd404993de3c70bef6d188a3fb91fc4909d73 100644 (file)
--- a/arch/blackfin/include/asm/clock.h
+++ b/arch/blackfin/include/asm/clock.h
@@ -10,7 +10,7 @@
 #include <asm/blackfin.h>
 #ifdef PLL_CTL
 #include <asm/mach-common/bits/pll.h>
-# define pll_is_bypassed() (bfin_read_PLL_STAT() & DF)
+# define pll_is_bypassed() (bfin_read_PLL_CTL() & BYPASS)
 #else
 #include <asm/mach-common/bits/cgu.h>
 # define pll_is_bypassed() (bfin_read_CGU_STAT() & PLLBP)
@@ -55,7 +55,11 @@ static inline uint32_t early_get_uart_clk(void)
        if (!pll_is_bypassed()) {
                div = bfin_read_PLL_DIV();
                ssel = (div & SSEL) >> SSEL_P;
+#if CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS
+               sclk = vco/ssel;
+#else
                sclk = early_division(vco, ssel);
+#endif
        }
        uclk = sclk;
 #ifdef CGU_DIV