]> err.no Git - linux-2.6/commitdiff
[Blackfin] arch: Cleanup Kconfig, fix comment and make sure we exclude CCLK=SCLK...
authorMichael Hennerich <michael.hennerich@analog.com>
Wed, 7 May 2008 03:41:26 +0000 (11:41 +0800)
committerBryan Wu <cooloney@kernel.org>
Wed, 7 May 2008 03:41:26 +0000 (11:41 +0800)
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
arch/blackfin/Kconfig
arch/blackfin/mach-common/cpufreq.c

index 795d0ac67c2192a93c6fd0404bb3e9fed92c45d7..7f1ab802537fe84a58ad5fce7aee7096a59b3ebf 100644 (file)
@@ -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"
index ed81e00d20e172cd8c14e9966d77211fc00f2c49..dd1515e4094c9e0bf24830d803e4f7c34096e69a 100644 (file)
@@ -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;