summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@nxp.com>2016-07-18 10:19:28 -0300
committerPeng Fan <peng.fan@nxp.com>2016-09-18 17:31:50 +0800
commit697f9ffc0eea9facf2fdaf596f008560db42ea7d (patch)
tree2b670311ae489fac742a84e98fe2df84b65edc70 /arch
parent505e899ce582118da28ca1f4487ce7f179225bd7 (diff)
downloadu-boot-imx-697f9ffc0eea9facf2fdaf596f008560db42ea7d.zip
u-boot-imx-697f9ffc0eea9facf2fdaf596f008560db42ea7d.tar.gz
u-boot-imx-697f9ffc0eea9facf2fdaf596f008560db42ea7d.tar.bz2
mx6: clock: Fix the logic for reading axi_alt_sel
According to the IMX6DQRM Reference Manual, the description of bit 7 (axi_alt_sel) of the CCM_CBCDR register is: "AXI alternative clock select 0 pll2 396MHz PFD will be selected as alternative clock for AXI root clock 1 pll3 540MHz PFD will be selected as alternative clock for AXI root clock " The current logic is inverted, so fix it to match the reference manual. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> (cherry picked from commit 8f2e2f15ffa1bb03b6e6e189312426059f3215d1)
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/armv7/mx6/clock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c
index 0cb576f..f93475a 100644
--- a/arch/arm/cpu/armv7/mx6/clock.c
+++ b/arch/arm/cpu/armv7/mx6/clock.c
@@ -456,9 +456,9 @@ static u32 get_axi_clk(void)
if (cbcdr & MXC_CCM_CBCDR_AXI_SEL) {
if (cbcdr & MXC_CCM_CBCDR_AXI_ALT_SEL)
- root_freq = mxc_get_pll_pfd(PLL_BUS, 2);
- else
root_freq = mxc_get_pll_pfd(PLL_USBOTG, 1);
+ else
+ root_freq = mxc_get_pll_pfd(PLL_BUS, 2);
} else
root_freq = get_periph_clk();