[CPUFREQ] Fix ARM cpufreq governor selection

From: Russell King <rmk@arm.linux.org.uk>

[CPUFREQ] Fix ARM cpufreq governor selection
From: Russell King <rmk@arm.linux.org.uk>
29a21004 · Dave Jones · 42124408 · 29a21004 · 29a21004
Commit 29a21004 authored Feb 26, 2004 by Dave Jones
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

arch/arm/Kconfig arch/arm/Kconfig +0 -2

drivers/cpufreq/Kconfig drivers/cpufreq/Kconfig +2 -1

No files found.
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -336,14 +336,12 @@ 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
-	select CPU_FREQ_DEFAULT_GOV_USERSPACE
 	select CPU_FREQ_24_API if SYSCTL

 config CPU_FREQ_INTEGRATOR

--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -13,7 +13,8 @@ config CPU_FREQ_PROC_INTF
 choice
 	prompt "Default CPUFreq governor"
 	depends on CPU_FREQ
-	default CPU_FREQ_DEFAULT_GOV_PERFORMANCE
+	default CPU_FREQ_DEFAULT_GOV_PERFORMANCE if !CPU_FREQ_SA1100 && !CPU_FREQ_SA1110
+	default CPU_FREQ_DEFAULT_GOV_USERSPACE if CPU_FREQ_SA1100 || CPU_FREQ_SA1110
 	help
 	  This option sets which CPUFreq governor shall be loaded at
 	  startup. If in doubt, select 'performance'.