From 5976f09410de9173847070c97b3060453015d419 Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Mon, 11 Mar 2013 13:26:33 +0400 Subject: [PATCH] ARM: clps711x: Replace numeric PLL option with boolean for raise CPU frequency Signed-off-by: Alexander Shiyan Signed-off-by: Sascha Hauer --- arch/arm/boards/clep7212/lowlevel.c | 8 +++++--- arch/arm/mach-clps711x/Kconfig | 13 ++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/arch/arm/boards/clep7212/lowlevel.c b/arch/arm/boards/clep7212/lowlevel.c index fcf828500..92fbb9b53 100644 --- a/arch/arm/boards/clep7212/lowlevel.c +++ b/arch/arm/boards/clep7212/lowlevel.c @@ -14,13 +14,15 @@ #include -#if (CONFIG_CLPS711X_CPU_PLL_MULT < 20) || (CONFIG_CLPS711X_CPU_PLL_MULT > 50) -# error "CPU PLL multiplier out of range" +#ifdef CONFIG_CLPS711X_RAISE_CPUFREQ +# define CLPS711X_CPU_PLL_MULT 50 +#else +# define CLPS711X_CPU_PLL_MULT 40 #endif void __naked __bare_init barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - clps711x_barebox_entry(CONFIG_CLPS711X_CPU_PLL_MULT); + clps711x_barebox_entry(CLPS711X_CPU_PLL_MULT); } diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig index d2873b4c0..b774c540b 100644 --- a/arch/arm/mach-clps711x/Kconfig +++ b/arch/arm/mach-clps711x/Kconfig @@ -12,14 +12,13 @@ endchoice menu "CLPS711X specific settings" -config CLPS711X_CPU_PLL_MULT - int "CPU PLL multiplier (20-50)" - range 20 50 - default "40" +config CLPS711X_RAISE_CPUFREQ + bool "Raise CPU frequency to 90 MHz" + depends on MACH_CLEP7212 help - Define CPU PLL multiplier. PLL is calculated by formula: - PLL Frequency = (PLL Multiplier / 2) * 3686400 Hz - Default value is 40, for achieve 73 MHz. + Raise CPU frequency to 90 MHz. This operation can be performed + only for devices which allow to operate at 90 MHz. + If option is not selected, CPU frequency will set to default 73 MHz. endmenu