summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Packham <judge.packham@gmail.com>2016-10-26 14:08:30 +1300
committerStefan Roese <sr@denx.de>2016-12-01 09:09:20 +0100
commita53d97ae851f6ddd2cb3dbb9cad63f4c3997f542 (patch)
tree8fca919c031025137490839803990d0180bb33d7
parenteb1f7784f4643329227bf63aa0d6e11d2941c996 (diff)
downloadu-boot-a53d97ae851f6ddd2cb3dbb9cad63f4c3997f542.tar.gz
u-boot-a53d97ae851f6ddd2cb3dbb9cad63f4c3997f542.tar.bz2
u-boot-a53d97ae851f6ddd2cb3dbb9cad63f4c3997f542.zip
arm: mvebu: move SYS_MVEBU_PLL_CLOCK to Kconfig
The main PLL frequency is 2GHz for Armada-XP and 1GHZ for Armada 375, 38x and 39x. [ Linux commit ae142bd9976532aa5232ab0b00e621690d8bfe6a ] Signed-off-by: Chris Packham <judge.packham@gmail.com> Signed-off-by: Stefan Roese <sr@denx.de>
-rw-r--r--arch/arm/mach-mvebu/Kconfig6
-rw-r--r--arch/arm/mach-mvebu/include/mach/soc.h3
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)