diff options
| author | Tom Rini <trini@ti.com> | 2014-01-16 13:50:16 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-01-16 13:50:16 -0500 |
| commit | 4913fc23f0b19a82e2e9cc56f7ee0087839855c4 (patch) | |
| tree | b3229e94d952021236a6ec29e6bfe1d6fd050dee /arch/arm/cpu/armv7/mx6 | |
| parent | b5c068f3f8be5c2f73fc6699885aec0d342099bb (diff) | |
| parent | c71b4dd2da0dcddabd7c29e6c3dc8a495d4bd928 (diff) | |
| download | olio-uboot-2014.01-4913fc23f0b19a82e2e9cc56f7ee0087839855c4.tar.xz olio-uboot-2014.01-4913fc23f0b19a82e2e9cc56f7ee0087839855c4.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/mx6')
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/clock.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c index f12bba294..5617a410d 100644 --- a/arch/arm/cpu/armv7/mx6/clock.c +++ b/arch/arm/cpu/armv7/mx6/clock.c @@ -323,7 +323,7 @@ static u32 get_mmdc_ch0_clk(void) #endif #ifdef CONFIG_FEC_MXC -int enable_fec_anatop_clock(void) +int enable_fec_anatop_clock(enum enet_freq freq) { u32 reg = 0; s32 timeout = 100000; @@ -331,7 +331,13 @@ int enable_fec_anatop_clock(void) struct anatop_regs __iomem *anatop = (struct anatop_regs __iomem *)ANATOP_BASE_ADDR; + if (freq < ENET_25MHz || freq > ENET_125MHz) + return -EINVAL; + reg = readl(&anatop->pll_enet); + reg &= ~BM_ANADIG_PLL_ENET_DIV_SELECT; + reg |= freq; + if ((reg & BM_ANADIG_PLL_ENET_POWERDOWN) || (!(reg & BM_ANADIG_PLL_ENET_LOCK))) { reg &= ~BM_ANADIG_PLL_ENET_POWERDOWN; |