Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / drivers / cpufreq / Kconfig

diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index aa8eaca..491779a 100644 (file)
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -13,9 +13,13 @@ config CPU_FREQ
 
          If in doubt, say N.
 
+if CPU_FREQ
+
+config CPU_FREQ_TABLE
+       def_tristate m
+
 config CPU_FREQ_DEBUG
        bool "Enable CPUfreq debugging"
-       depends on CPU_FREQ
        help
          Say Y here to enable CPUfreq subsystem (including drivers)
          debugging. You will need to activate it via the kernel
@@ -27,23 +31,29 @@ config CPU_FREQ_DEBUG
               2 to activate CPUfreq drivers debugging, and
               4 to activate CPUfreq governor debugging
 
-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 <file:Documentation/cpu-freq/>.
-         
-         If in doubt, say N.
+config CPU_FREQ_STAT
+       tristate "CPU frequency translation statistics"
+       select CPU_FREQ_TABLE
+       default y
+       help
+         This driver exports CPU frequency statistics information through sysfs
+         file system
+
+config CPU_FREQ_STAT_DETAILS
+       bool "CPU frequency translation statistics details"
+       depends on CPU_FREQ_STAT
+       help
+         This will show detail CPU frequency translation table in sysfs file
+         system
+
+# Note that it is not currently possible to set the other governors (such as ondemand)
+# as the default, since if they fail to initialise, cpufreq will be
+# left in an undefined state.
 
 choice
        prompt "Default CPUFreq governor"
-       depends on CPU_FREQ
-       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
+       default CPU_FREQ_DEFAULT_GOV_PERFORMANCE
        help
          This option sets which CPUFreq governor shall be loaded at
          startup. If in doubt, select 'performance'.
@@ -69,7 +79,6 @@ endchoice
 
 config CPU_FREQ_GOV_PERFORMANCE
        tristate "'performance' governor"
-       depends on CPU_FREQ
        help
          This cpufreq governor sets the frequency statically to the
          highest available CPU frequency.
@@ -78,7 +87,6 @@ config CPU_FREQ_GOV_PERFORMANCE
 
 config CPU_FREQ_GOV_POWERSAVE
        tristate "'powersave' governor"
-       depends on CPU_FREQ
        help
          This cpufreq governor sets the frequency statically to the
          lowest available CPU frequency.
@@ -87,35 +95,19 @@ config CPU_FREQ_GOV_POWERSAVE
 
 config CPU_FREQ_GOV_USERSPACE
        tristate "'userspace' governor for userspace frequency scaling"
-       depends on CPU_FREQ 
        help
          Enable this cpufreq governor when you either want to set the
          CPU frequency manually or when an userspace program shall
          be able to set the CPU dynamically, like on LART 
-         <http://www.lart.tudelft.nl/>
+         <http://www.lartmaker.nl/>.
 
          For details, take a look at <file:Documentation/cpu-freq/>.
 
          If in doubt, say Y.
 
-config CPU_FREQ_24_API
-       bool "/proc/sys/cpu/ interface (2.4. / OLD)"
-       depends on CPU_FREQ_GOV_USERSPACE
-       depends on SYSCTL
-       help
-         This enables the /proc/sys/cpu/ sysctl interface for controlling
-         the CPUFreq,"userspace" governor. This is the same interface
-         as known from the 2.4.-kernel patches for CPUFreq, and offers
-         the same functionality as long as "userspace" is the
-         selected governor for the specified CPU.
-       
-         For details, take a look at <file:Documentation/cpu-freq/>.
-
-         If in doubt, say N.
-
 config CPU_FREQ_GOV_ONDEMAND
        tristate "'ondemand' cpufreq policy governor"
-       depends on CPU_FREQ
+       select CPU_FREQ_TABLE
        help
          'ondemand' - This driver adds a dynamic cpufreq policy governor.
          The governor does a periodic polling and 
@@ -127,3 +119,25 @@ config CPU_FREQ_GOV_ONDEMAND
          For details, take a look at linux/Documentation/cpu-freq.
 
          If in doubt, say N.
+
+config CPU_FREQ_GOV_CONSERVATIVE
+       tristate "'conservative' cpufreq governor"
+       depends on CPU_FREQ
+       help
+         'conservative' - this driver is rather similar to the 'ondemand'
+         governor both in its source code and its purpose, the difference is
+         its optimisation for better suitability in a battery powered
+         environment.  The frequency is gracefully increased and decreased
+         rather than jumping to 100% when speed is required.
+
+         If you have a desktop machine then you should really be considering
+         the 'ondemand' governor instead, however if you are using a laptop,
+         PDA or even an AMD64 based computer (due to the unacceptable
+         step-by-step latency issues between the minimum and maximum frequency
+         transitions in the CPU) you will probably want to use this governor.
+
+         For details, take a look at linux/Documentation/cpu-freq.
+
+         If in doubt, say N.
+
+endif  # CPU_FREQ