diff options
| author | Tom Rini <trini@konsulko.com> | 2016-12-01 09:24:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-01 09:24:02 -0500 |
| commit | 9ae0e14350758e6447c90615ff4df530549a45e2 (patch) | |
| tree | 61d253b20c07a34f67ae2d95625dd63bf660e648 /arch | |
| parent | 09410c65724dd0a58e01f94a518c80befc413d90 (diff) | |
| parent | 2611c05e840033e4c4ab83115836d7657f5b316b (diff) | |
Merge git://www.denx.de/git/u-boot-marvell
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 6 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/include/mach/soc.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 6e8026bde2..7733936be5 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -36,6 +36,12 @@ config ARMADA_8K bool select ARM64 +# Armada PLL frequency (used for NAND clock generation) +config SYS_MVEBU_PLL_CLOCK + int + default "2000000000" if ARMADA_XP || ARMADA_3700 || ARMADA_8K + default "1000000000" if ARMADA_38X || ARMADA_375 + # Armada XP/38x SoC types... config MV78230 bool diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index 731fe65ae4..0f69f3341b 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -31,9 +31,6 @@ #define CONFIG_SYS_TCLK 250000000 /* 250MHz */ #endif -/* Armada XP PLL frequency (used for NAND clock generation) */ -#define CONFIG_SYS_MVEBU_PLL_CLOCK 2000000000 - /* SOC specific definations */ #define INTREG_BASE 0xd0000000 #define INTREG_BASE_ADDR_REG (INTREG_BASE + 0x20080) |