diff options
| author | Tom Rini <trini@konsulko.com> | 2017-10-12 13:36:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-10-12 13:36:37 -0400 |
| commit | e11d2fff73b5c0e04027b55020a0a56d9dc72aa4 (patch) | |
| tree | 506fe0f032e17fbe0854de7a64478b66e10a5379 /arch/arm/mach-imx/mx6/clock.c | |
| parent | 1b22c5ba496ffc9b0702919d58c410ed1527ab63 (diff) | |
| parent | 0a333602df9fd9dcd6f58c8c098b29a3bd1dffcc (diff) | |
Merge git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/mach-imx/mx6/clock.c')
| -rw-r--r-- | arch/arm/mach-imx/mx6/clock.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/arch/arm/mach-imx/mx6/clock.c b/arch/arm/mach-imx/mx6/clock.c index 0e019c4262..71a9e6bca0 100644 --- a/arch/arm/mach-imx/mx6/clock.c +++ b/arch/arm/mach-imx/mx6/clock.c @@ -1220,6 +1220,20 @@ void enable_thermal_clk(void) enable_pll3(); } +#ifdef CONFIG_MTD_NOR_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 + unsigned int mxc_get_clock(enum mxc_clock clk) { switch (clk) { @@ -1262,6 +1276,7 @@ unsigned int mxc_get_clock(enum mxc_clock clk) return 0; } +#ifndef CONFIG_SPL_BUILD /* * Dump some core clockes. */ @@ -1463,20 +1478,6 @@ void select_ldb_di_clock_source(enum ldb_di_clock clk) } #endif -#ifdef CONFIG_MTD_NOR_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( @@ -1484,3 +1485,4 @@ U_BOOT_CMD( "display clocks", "" ); +#endif |