[ARM] CPUFREQ - allow ARM to work with userspace governor.

Patch from Dominik Brodowski.

This patch is necessary to update the ARM drivers so that they can
live with the new cpufreq governor "userspace" (which I sent to Linus a
moment ago).

arch/arm/Kconfig

@@ -534,6 +534,9 @@ config CPU_FREQ
 	  written) to implement the policy. If you don't understand what this
 	  is all about, it's safe to say 'N'.
 
+
+# CPUfreq on SA11x0 is special -- it _needs_ the userspace governor
+
 config CPU_FREQ_SA1100
 	bool
 	depends on CPU_FREQ && SA1100_LART
@@ -544,20 +547,16 @@ config CPU_FREQ_SA1110
 	depends on CPU_FREQ && (SA1100_ASSABET || SA1100_CERF || SA1100_PT_SYSTEM3)
 	default y
 
-config CPU_FREQ_INTEGRATOR
-	tristate "CPUfreq driver for ARM Integrator CPUs"
-	depends on ARCH_INTEGRATOR && CPU_FREQ
-	default y
-	help
-	  This enables the CPUfreq driver for ARM Integrator CPUs.
+if (CPU_FREQ_SA1100 || CPU_FREQ_SA1110)
 
-	  For details, take a look at linux/Documentation/cpufreq.
-
-	  If in doubt, say Y.
+config CPU_FREQ_GOV_USERSPACE
+ 	bool
+ 	depends on CPU_FREQ
+ 	default y
 
 config CPU_FREQ_24_API
 	bool
-	depends on CPU_FREQ
+	depends on CPU_FREQ_GOV_USERSPACE && SYSCTL
 	default y
 
 config CPU_FREQ_PROC_INTF
@@ -572,6 +571,27 @@ config CPU_FREQ_PROC_INTF
 
 	  If in doubt, say N.
 
+endif
+
+# CPUfreq on Integrator can use the generic cpufreq core
+
+config CPU_FREQ_INTEGRATOR
+	tristate "CPUfreq driver for ARM Integrator CPUs"
+	depends on ARCH_INTEGRATOR && CPU_FREQ
+	default y
+	help
+	  This enables the CPUfreq driver for ARM Integrator CPUs.
+
+	  For details, take a look at linux/Documentation/cpufreq.
+
+	  If in doubt, say Y.
+
+if (CPU_FREQ_INTEGRATOR)
+
+source "drivers/cpufreq/Kconfig"
+
+endif
+
 source "drivers/pci/Kconfig"
 
 config HOTPLUG

arch/arm/mach-integrator/cpu.c

@@ -204,7 +204,7 @@ static int integrator_cpufreq_init(struct cpufreq *policy)
 	policy->cpuinfo.max_freq = 160000;
 	policy->cpuinfo.min_freq = 12000;
 	policy->cpuinfo.transition_latency = 1000; /* 1 ms, assumed */
-	integrator_driver.cpu_cur_freq[policy->cpu] = policy->min = policy->max = vco_to_freq(vco, 1); /* current freq */
+	policy->cur = policy->min = policy->max = vco_to_freq(vco, 1); /* current freq */
 
 	set_cpus_allowed(current, cpus_allowed);
 

arch/arm/mach-sa1100/cpu-sa1100.c

@@ -221,7 +221,7 @@ static int __init sa1100_cpu_init(struct cpufreq_policy *policy)
 {
 	if (policy->cpu != 0)
 		return -EINVAL;
-	sa1100_driver.cpu_cur_freq[policy->cpu] = policy->min = policy->max = sa11x0_getspeed();
+	policy->cur = policy->min = policy->max = sa11x0_getspeed();
 	policy->policy = CPUFREQ_POLICY_POWERSAVE;
 	policy->cpuinfo.min_freq = 59000;
 	policy->cpuinfo.max_freq = 287000;
@@ -238,7 +238,8 @@ static struct cpufreq_driver sa1100_driver = {
 
 static int __init sa1100_dram_init(void)
 {
-	if ((processor_id & CPU_SA1100_MASK) == CPU_SA1100_ID)
+	cpufreq_gov_userspace_init();
+ 	if ((processor_id & CPU_SA1100_MASK) == CPU_SA1100_ID)
 		return cpufreq_register_driver(&sa1100_driver);
 	else
 		return -ENODEV;

arch/arm/mach-sa1100/cpu-sa1110.c

@@ -314,7 +314,7 @@ static int __init sa1110_cpu_init(struct cpufreq_policy *policy)
 {
 	if (policy->cpu != 0)
 		return -EINVAL;
-	sa1110_driver.cpu_cur_freq[policy->cpu] = policy->min = policy->max = sa11x0_getspeed();
+	policy->cur = policy->min = policy->max = sa11x0_getspeed();
 	policy->policy = CPUFREQ_POLICY_POWERSAVE;
 	policy->cpuinfo.min_freq = 59000;
 	policy->cpuinfo.max_freq = 287000;
@@ -348,6 +348,8 @@ static int __init sa1110_clk_init(void)
 			sdram->tck, sdram->trcd, sdram->trp,
 			sdram->twr, sdram->refresh, sdram->cas_latency);
 
+		cpufreq_gov_userspace_init();
+ 
 		memcpy(&sdram_params, sdram, sizeof(sdram_params));
 
 		return cpufreq_register_driver(&sa1110_driver);