Skip to content

Commit

Permalink
[Blackfin] arch: Cleanup Kconfig, fix comment and make sure we exclud…
Browse files Browse the repository at this point in the history
…e CCLK=SCLK for some configurations

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
  • Loading branch information
Michael Hennerich authored and Bryan Wu committed May 7, 2008
1 parent 28a4acb commit 67dea02
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
10 changes: 0 additions & 10 deletions arch/blackfin/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions arch/blackfin/mach-common/cpufreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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;
Expand Down

0 comments on commit 67dea02

Please sign in to comment.