mx25 clocks: Fix MXC_FEC_CLK

[u-boot] / arch / arm / cpu / arm926ejs / mx25 / generic.c

diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index d34e84cf9abbe55800e6009c17f9bae009f3003c..fc92c9bf1d9a7c93490541de3953af2cd625205f 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -80,12 +80,12 @@ ulong imx_get_armclk(void)
        ulong div;
 
        if (cctl & CCM_CCTL_ARM_SRC)
-               fref = lldiv((fref * 3), 4);
+               fref = lldiv((u64) fref * 3, 4);
 
        div = ((cctl >> CCM_CCTL_ARM_DIV_SHIFT)
               & CCM_CCTL_ARM_DIV_MASK) + 1;
 
-       return lldiv(fref, div);
+       return fref / div;
 }
 
 ulong imx_get_ahbclk(void)
@@ -98,7 +98,12 @@ ulong imx_get_ahbclk(void)
        div = ((cctl >> CCM_CCTL_AHB_DIV_SHIFT)
               & CCM_CCTL_AHB_DIV_MASK) + 1;
 
-       return lldiv(fref, div);
+       return fref / div;
+}
+
+static ulong imx_get_ipgclk(void)
+{
+       return imx_get_ahbclk() / 2;
 }
 
 ulong imx_get_perclk(int clk)
@@ -110,7 +115,7 @@ ulong imx_get_perclk(int clk)
        div = readl(&ccm->pcdr[CCM_PERCLK_REG(clk)]);
        div = ((div >> CCM_PERCLK_SHIFT(clk)) & CCM_PERCLK_MASK) + 1;
 
-       return lldiv(fref, div);
+       return fref / div;
 }
 
 unsigned int mxc_get_clock(enum mxc_clock clk)
@@ -120,8 +125,12 @@ unsigned int mxc_get_clock(enum mxc_clock clk)
        switch (clk) {
        case MXC_ARM_CLK:
                return imx_get_armclk();
-       case MXC_FEC_CLK:
+       case MXC_AHB_CLK:
                return imx_get_ahbclk();
+       case MXC_IPG_CLK:
+       case MXC_CSPI_CLK:
+       case MXC_FEC_CLK:
+               return imx_get_ipgclk();
        default:
                return imx_get_perclk(clk);
        }