[CPUFREQ][ARM] allow for easier Kconfig usage on ARM, and more features for SA11x0...

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f4846273df06998ea1ef3c35a75ae76645d91b3f..31cca56d8e2fc1d1433810b56df407e96b7ab327 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -542,39 +542,15 @@ config CPU_FREQ_SA1100
        bool
        depends on CPU_FREQ && SA1100_LART
        default y
+       select CPU_FREQ_DEFAULT_GOV_USERSPACE
+       select CPU_FREQ_24_API if SYSCTL
 
 config CPU_FREQ_SA1110
        bool
        depends on CPU_FREQ && (SA1100_ASSABET || SA1100_CERF || SA1100_PT_SYSTEM3)
        default y
-
-if (CPU_FREQ_SA1100 || CPU_FREQ_SA1110)
-
-config CPU_FREQ_GOV_USERSPACE
-       tristate
-       depends on CPU_FREQ
-       default y
-
-config CPU_FREQ_24_API
-       bool
-       depends on CPU_FREQ_GOV_USERSPACE && SYSCTL
-       default y
-
-config CPU_FREQ_PROC_INTF
-       tristate "/proc/cpufreq interface (deprecated)"
-       depends on CPU_FREQ && PROC_FS
-       help
-         This enables the /proc/cpufreq interface for controlling
-         CPUFreq. Please note that it is recommended to use the sysfs
-         interface instead (which is built automatically).
-
-         For details, take a look at linux/Documentation/cpufreq.
-
-         If in doubt, say N.
-
-endif
-
-# CPUfreq on Integrator can use the generic cpufreq core
+       select CPU_FREQ_DEFAULT_GOV_USERSPACE
+       select CPU_FREQ_24_API if SYSCTL
 
 config CPU_FREQ_INTEGRATOR
        tristate "CPUfreq driver for ARM Integrator CPUs"
@@ -587,7 +563,7 @@ config CPU_FREQ_INTEGRATOR
 
          If in doubt, say Y.
 
-if (CPU_FREQ_INTEGRATOR)
+if (CPU_FREQ_INTEGRATOR) || (CPU_FREQ_SA1110) || (CPU_FREQ_SA1100)
 
 source "drivers/cpufreq/Kconfig"
 

diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c
index c14943864287dec8abcf16a247162559628fa5ad..50eab0a09c11ba309ce7bb738d5f52e31ea74caf 100644 (file)
--- a/arch/arm/mach-integrator/cpu.c
+++ b/arch/arm/mach-integrator/cpu.c
@@ -170,7 +170,7 @@ static int integrator_cpufreq_init(struct cpufreq_policy *policy)
        vco.r = 22;
 
        /* set default policy and cpuinfo */
-       policy->policy = CPUFREQ_POLICY_PERFORMANCE;
+       policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
        policy->cpuinfo.max_freq = 160000;
        policy->cpuinfo.min_freq = 12000;
        policy->cpuinfo.transition_latency = 1000; /* 1 ms, assumed */

diff --git a/arch/arm/mach-sa1100/cpu-sa1100.c b/arch/arm/mach-sa1100/cpu-sa1100.c
index f71a28cdcf266ff4a76ad8fa03158e9e7b764904..2ec95ad1db472379a07389d6153f80ef3df7514e 100644 (file)
--- a/arch/arm/mach-sa1100/cpu-sa1100.c
+++ b/arch/arm/mach-sa1100/cpu-sa1100.c
@@ -222,7 +222,7 @@ static int __init sa1100_cpu_init(struct cpufreq_policy *policy)
        if (policy->cpu != 0)
                return -EINVAL;
        policy->cur = policy->min = policy->max = sa11x0_getspeed();
-       policy->policy = CPUFREQ_POLICY_POWERSAVE;
+       policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
        policy->cpuinfo.min_freq = 59000;
        policy->cpuinfo.max_freq = 287000;
        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;

diff --git a/arch/arm/mach-sa1100/cpu-sa1110.c b/arch/arm/mach-sa1100/cpu-sa1110.c
index 87a0d789e34adaf3d18a561ad7e281e5a085c2e7..fd1092e4939ca793f5c1ee0498b23fc6ded9d5c3 100644 (file)
--- a/arch/arm/mach-sa1100/cpu-sa1110.c
+++ b/arch/arm/mach-sa1100/cpu-sa1110.c
@@ -317,7 +317,7 @@ static int __init sa1110_cpu_init(struct cpufreq_policy *policy)
        if (policy->cpu != 0)
                return -EINVAL;
        policy->cur = policy->min = policy->max = sa11x0_getspeed();
-       policy->policy = CPUFREQ_POLICY_POWERSAVE;
+       policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
        policy->cpuinfo.min_freq = 59000;
        policy->cpuinfo.max_freq = 287000;
        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;