diff options
author | Peng Fan <peng.fan@nxp.com> | 2016-03-04 15:37:58 +0800 |
---|---|---|
committer | Stefan Agner <stefan.agner@toradex.com> | 2017-08-31 19:57:39 -0700 |
commit | 09983d0632351cd5373cbb1467025be5e0dd0de6 (patch) | |
tree | 2b8d8f0a947d6fde420ba48a571eb40f0fc1c179 | |
parent | 6d6a643ea12c6fe1a2feaa52f4c6cccfb556bd68 (diff) |
MLK-12486-1: switch to use setup_gpmi_io_clk for i.MX6UL
Add i.MX6UL support in setup_gpmi_io_clk and change
mx6ul_14x14_evk to use it.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit f39d809ef99c3727e17285c52df9cd01020bee65)
Conflicts:
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r-- | arch/arm/cpu/armv7/mx6/clock.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c index ae3143c7607..b4a2e39ff6c 100644 --- a/arch/arm/cpu/armv7/mx6/clock.c +++ b/arch/arm/cpu/armv7/mx6/clock.c @@ -59,6 +59,19 @@ void setup_gpmi_io_clk(u32 cfg) cfg); setbits_le32(&imx_ccm->CCGR4, MXC_CCM_CCGR4_QSPI2_ENFC_MASK); +#elif defined(CONFIG_MX6UL) + /* + * config gpmi and bch clock to 100 MHz + * bch/gpmi select PLL2 PFD2 400M + * 100M = 400M / 4 + */ + clrbits_le32(&imx_ccm->cscmr1, + MXC_CCM_CSCMR1_BCH_CLK_SEL | + MXC_CCM_CSCMR1_GPMI_CLK_SEL); + clrsetbits_le32(&imx_ccm->cscdr1, + MXC_CCM_CSCDR1_BCH_PODF_MASK | + MXC_CCM_CSCDR1_GPMI_PODF_MASK, + cfg); #else clrbits_le32(&imx_ccm->CCGR2, MXC_CCM_CCGR2_IOMUX_IPT_CLK_IO_MASK); |