diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-10-15 15:34:14 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-10-15 15:34:14 +0200 |
| commit | f74dc51bcab924a30e41b33981a4f96af3f9dd57 (patch) | |
| tree | 560eead1ca9984554be3a5c9a5332b531c102cb0 /arch/arm/cpu/arm926ejs/lpc32xx | |
| parent | cf04ad3219260c3c39ec3dbfe2427e3463e8dbd5 (diff) | |
| parent | 297faccca2235e359012118495b9b73451d54bb9 (diff) | |
| download | u-boot-imx-f74dc51bcab924a30e41b33981a4f96af3f9dd57.zip u-boot-imx-f74dc51bcab924a30e41b33981a4f96af3f9dd57.tar.gz u-boot-imx-f74dc51bcab924a30e41b33981a4f96af3f9dd57.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'arch/arm/cpu/arm926ejs/lpc32xx')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/lpc32xx/clk.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/clk.c b/arch/arm/cpu/arm926ejs/lpc32xx/clk.c index 1ef8a36..f5e2103 100644 --- a/arch/arm/cpu/arm926ejs/lpc32xx/clk.c +++ b/arch/arm/cpu/arm926ejs/lpc32xx/clk.c @@ -54,12 +54,12 @@ unsigned int get_hclk_pll_rate(void) if (fref > 27000000ULL || fref < 1000000ULL) return 0; - fout = fref * m_div; - if (val & CLK_HCLK_PLL_FEEDBACK) { - fcco = fout; + fcco = fref * m_div; + fout = fcco; + if (val & CLK_HCLK_PLL_FEEDBACK) + fcco *= p_div; + else do_div(fout, p_div); - } else - fcco = fout * p_div; if (fcco > 320000000ULL || fcco < 156000000ULL) return 0; |