summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@nxp.com>2016-07-18 10:19:28 -0300
committerStefano Babic <sbabic@denx.de>2016-07-20 18:26:37 +0200
commit8f2e2f15ffa1bb03b6e6e189312426059f3215d1 (patch)
tree590d7251e471c82dbe64ba604c57bc5fea0803d4 /arch/arm
parent95cee94bd80c8dfbd5ac3b019782b55f4edebdeb (diff)
downloadu-boot-imx-8f2e2f15ffa1bb03b6e6e189312426059f3215d1.zip
u-boot-imx-8f2e2f15ffa1bb03b6e6e189312426059f3215d1.tar.gz
u-boot-imx-8f2e2f15ffa1bb03b6e6e189312426059f3215d1.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>
Diffstat (limited to 'arch/arm')
-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 9b4b69c..b3c9dcc 100644
--- a/arch/arm/cpu/armv7/mx6/clock.c
+++ b/arch/arm/cpu/armv7/mx6/clock.c
@@ -433,9 +433,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();