diff options
| author | Tom Rini <trini@konsulko.com> | 2016-08-26 07:41:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-08-26 07:41:54 -0400 |
| commit | c733c18e35c161fefdd4141bdce7a69b1bcfd302 (patch) | |
| tree | 7d6cb30cca33890009e0b08804a457f08b3db89c /arch/arm/mach-mvebu/cpu.c | |
| parent | 4832c7f5f79feebf8549f33c7257dec47c336470 (diff) | |
| parent | bdf58c73ca406e31be49ad875969b2f9aacb9b65 (diff) | |
| download | u-boot-imx-c733c18e35c161fefdd4141bdce7a69b1bcfd302.zip u-boot-imx-c733c18e35c161fefdd4141bdce7a69b1bcfd302.tar.gz u-boot-imx-c733c18e35c161fefdd4141bdce7a69b1bcfd302.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-marvell
Diffstat (limited to 'arch/arm/mach-mvebu/cpu.c')
| -rw-r--r-- | arch/arm/mach-mvebu/cpu.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index fd66f59..5eb2a39 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -452,8 +452,15 @@ int arch_cpu_init(void) u32 mvebu_get_nand_clock(void) { + u32 reg; + + if (mvebu_soc_family() == MVEBU_SOC_A38X) + reg = MVEBU_DFX_DIV_CLK_CTRL(1); + else + reg = MVEBU_CORE_DIV_CLK_CTRL(1); + return CONFIG_SYS_MVEBU_PLL_CLOCK / - ((readl(MVEBU_CORE_DIV_CLK_CTRL(1)) & + ((readl(reg) & NAND_ECC_DIVCKL_RATIO_MASK) >> NAND_ECC_DIVCKL_RATIO_OFFS); } |