diff options
| author | Benoît Thébaudeau <benoit@wsystem.com> | 2017-05-03 11:59:04 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2017-05-31 10:14:17 +0200 |
| commit | f7c13e6a791b997e5b73f073db5f81864b882b61 (patch) | |
| tree | af75a4f5970d98ba940c18ea35281241bfdb04dd /arch/arm/cpu/arm926ejs | |
| parent | 4f425280fa718a88c436d16d88c2efd6a998943a (diff) | |
| download | u-boot-f7c13e6a791b997e5b73f073db5f81864b882b61.zip u-boot-f7c13e6a791b997e5b73f073db5f81864b882b61.tar.gz u-boot-f7c13e6a791b997e5b73f073db5f81864b882b61.tar.bz2 | |
mx25: Fix imx_get_perclk()
imx_get_perclk() used the AHB clock as the clock source for all PER
clocks, but the USB PLL output can also be a PER clock source if the
corresponding PER CLK MUX bit is set in CCM.MCR.
Signed-off-by: Benoît Thébaudeau <benoit@wsystem.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Diffstat (limited to 'arch/arm/cpu/arm926ejs')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/mx25/generic.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c index 0b1a8f4..f02cffb 100644 --- a/arch/arm/cpu/arm926ejs/mx25/generic.c +++ b/arch/arm/cpu/arm926ejs/mx25/generic.c @@ -58,6 +58,14 @@ static ulong imx_get_mpllclk(void) return imx_decode_pll(readl(&ccm->mpctl), fref); } +static ulong imx_get_upllclk(void) +{ + struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE; + ulong fref = MXC_HCLK; + + return imx_decode_pll(readl(&ccm->upctl), fref); +} + static ulong imx_get_armclk(void) { struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE; @@ -95,7 +103,8 @@ static ulong imx_get_ipgclk(void) static ulong imx_get_perclk(int clk) { struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE; - ulong fref = imx_get_ahbclk(); + ulong fref = readl(&ccm->mcr) & (1 << clk) ? imx_get_upllclk() : + imx_get_ahbclk(); ulong div; div = readl(&ccm->pcdr[CCM_PERCLK_REG(clk)]); |