From 09983d0632351cd5373cbb1467025be5e0dd0de6 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Fri, 4 Mar 2016 15:37:58 +0800 Subject: 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 (cherry picked from commit f39d809ef99c3727e17285c52df9cd01020bee65) Conflicts: board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- arch/arm/cpu/armv7/mx6/clock.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c index ae3143c760..b4a2e39ff6 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); -- cgit v1.2.3