2 files changed, 2 insertions, 12 deletions

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 795d0ac67c21..7f1ab802537f 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -963,22 +963,12 @@ endchoice
 
 endmenu
 
-if (BF537 || BF533 || BF54x)
-
 menu "CPU Frequency scaling"
 
 source "drivers/cpufreq/Kconfig"
 
-config CPU_FREQ
-        bool
-        default n
-        help
-          If you want to enable this option, you should select the
-          DPMC driver from Character Devices.
 endmenu
 
-endif
-
 source "net/Kconfig"
 
 source "drivers/Kconfig"
diff --git a/arch/blackfin/mach-common/cpufreq.c b/arch/blackfin/mach-common/cpufreq.c
index ed81e00d20e1..dd1515e4094c 100644
--- a/arch/blackfin/mach-common/cpufreq.c
+++ b/arch/blackfin/mach-common/cpufreq.c
@@ -121,7 +121,7 @@ static int __init __bfin_cpu_init(struct cpufreq_policy *policy)
 
 #ifdef CONFIG_CYCLES_CLOCKSOURCE
 /*
- * Clocksource CYCLES is still CONTINUOUS but not longer MONOTONIC in case we enable
+ * Clocksource CYCLES is still CONTINUOUS but not longer with a constant tick rate in case we enable
  * CPU frequency scaling, since CYCLES runs off Core Clock.
  */
         printk(KERN_WARNING "CPU frequency scaling not supported: Clocksource not suitable\n"
@@ -134,7 +134,7 @@ static int __init __bfin_cpu_init(struct cpufreq_policy *policy)
         cclk = get_cclk();
         sclk = get_sclk();
 
-#if ANOMALY_05000273
+#if ANOMALY_05000273 || (!defined(CONFIG_BF54x) && defined(CONFIG_BFIN_DCACHE))
         min_cclk = sclk * 2;
 #else
         min_cclk = sclk;