diff options
| author | Tom Rini <trini@konsulko.com> | 2016-11-30 09:57:52 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-11-30 09:57:52 -0500 |
| commit | 4d6647ab17ab9d33c60f7a9f07576c5fbdf6336f (patch) | |
| tree | e3bde11276fcf8ce1c02d797a71fa23d974c66f3 /arch/arm/cpu/armv7/mx6/clock.c | |
| parent | 6b29a395b62965eef6b5065d3a526a8588a92038 (diff) | |
| parent | 4db4d42ee290a8cad00b358b2e7ef6a00483893b (diff) | |
| download | u-boot-imx-4d6647ab17ab9d33c60f7a9f07576c5fbdf6336f.zip u-boot-imx-4d6647ab17ab9d33c60f7a9f07576c5fbdf6336f.tar.gz u-boot-imx-4d6647ab17ab9d33c60f7a9f07576c5fbdf6336f.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/cpu/armv7/mx6/clock.c')
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/clock.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c index ae3143c..2995628 100644 --- a/arch/arm/cpu/armv7/mx6/clock.c +++ b/arch/arm/cpu/armv7/mx6/clock.c @@ -881,6 +881,11 @@ int enable_fec_anatop_clock(int fec_id, enum enet_freq freq) writel(reg, &anatop->pll_enet); #ifdef CONFIG_MX6SX + /* Disable enet system clcok before switching clock parent */ + reg = readl(&imx_ccm->CCGR3); + reg &= ~MXC_CCM_CCGR3_ENET_MASK; + writel(reg, &imx_ccm->CCGR3); + /* * Set enet ahb clock to 200MHz * pll2_pfd2_396m-> ENET_PODF-> ENET_AHB @@ -1379,6 +1384,20 @@ void select_ldb_di_clock_source(enum ldb_di_clock clk) } #endif +#ifndef CONFIG_SYS_NO_FLASH +void enable_eim_clk(unsigned char enable) +{ + u32 reg; + + reg = __raw_readl(&imx_ccm->CCGR6); + if (enable) + reg |= MXC_CCM_CCGR6_EMI_SLOW_MASK; + else + reg &= ~MXC_CCM_CCGR6_EMI_SLOW_MASK; + __raw_writel(reg, &imx_ccm->CCGR6); +} +#endif + /***************************************************/ U_BOOT_CMD( |