mx6: clock: Fix the calculation of PLL_ENET frequency
authorFabio Estevam <fabio.estevam@freescale.com>
Tue, 3 Dec 2013 20:26:13 +0000 (18:26 -0200)
committerStefano Babic <sbabic@denx.de>
Tue, 17 Dec 2013 17:38:42 +0000 (18:38 +0100)
According to the mx6 quad reference manual, the DIV_SELECT field of register
CCM_ANALOG_PLL_ENETn has the following meaning:

"Controls the frequency of the ethernet reference clock.
- 00 - 25MHz
- 01 - 50MHz
- 10 - 100MHz
- 11 - 125MHz"

Current logic does not handle the 25MHz case correctly, so fix it.

Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
arch/arm/cpu/armv7/mx6/clock.c

index 873d9d0fd879b7b3f9f3534220b294c93e46717c..20c7e70a78901c0b4c586e75617d6b493e2b598e 100644 (file)
@@ -94,7 +94,7 @@ static u32 decode_pll(enum pll_clocks pll, u32 infreq)
                div = __raw_readl(&imx_ccm->analog_pll_enet);
                div &= BM_ANADIG_PLL_ENET_DIV_SELECT;
 
-               return (div == 3 ? 125000000 : 25000000 * (div << 1));
+               return 25000000 * (div + (div >> 1) + 1);
        default:
                return 0;
        }