From: Andre Renaud <andre@bluewatersys.com>
Date: Mon, 9 Jun 2014 20:47:13 +0000 (+1200)
Subject: MX6: Correct calculation of PLL_SYS
X-Git-Tag: v2014.07~5^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2eb268f6fd236a5ad9d51e7e47190d7994b3920f;p=oweals%2Fu-boot.git

MX6: Correct calculation of PLL_SYS

DIV_SELECT is used as Fout = Fin * div_select / 2.0, so we should do
the shift after the multiply to avoid rounding errors

Signed-off-by: Andre Renaud <andre@bluewatersys.com>
---

diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c
index bd65a08ba2..7dd83ec9e1 100644
--- a/arch/arm/cpu/armv7/mx6/clock.c
+++ b/arch/arm/cpu/armv7/mx6/clock.c
@@ -80,7 +80,7 @@ static u32 decode_pll(enum pll_clocks pll, u32 infreq)
 		div = __raw_readl(&imx_ccm->analog_pll_sys);
 		div &= BM_ANADIG_PLL_SYS_DIV_SELECT;
 
-		return infreq * (div >> 1);
+		return (infreq * div) >> 1;
 	case PLL_BUS:
 		div = __raw_readl(&imx_ccm->analog_pll_528);
 		div &= BM_ANADIG_PLL_528_DIV_SELECT;