Commit aa1d37df authored by Dave Jones's avatar Dave Jones Committed by Dave Jones

[CPUFREQ] arm Kconfig fixes

arm cpufreq Kconfig enhancements:
- don't force the deprecated 24_API on SA11x0 any more, as it will be removed
  ~2005-01-01 and different interfaces have been available for a long time
- don't mark CPU_FREQ as being EXPERIMENTAL any longer
- re-order it in the same way other arches are ordered
Signed-off-by: default avatarDominik Brodowski <linux@brodo.de>
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent 29df79ea
...@@ -344,9 +344,10 @@ config ZBOOT_ROM_BSS ...@@ -344,9 +344,10 @@ config ZBOOT_ROM_BSS
while the decompressor is running. Unless you have special requirements, while the decompressor is running. Unless you have special requirements,
you should not change this value. you should not change this value.
if (ARCH_SA1100 || ARCH_INTEGRATOR)
config CPU_FREQ config CPU_FREQ
bool "Support CPU clock change (EXPERIMENTAL)" bool "Support CPU clock change"
depends on (ARCH_SA1100 || ARCH_INTEGRATOR) && EXPERIMENTAL
help help
CPU clock scaling allows you to change the clock speed of the CPU clock scaling allows you to change the clock speed of the
running CPU on the fly. This is a nice method to save battery power, running CPU on the fly. This is a nice method to save battery power,
...@@ -356,20 +357,17 @@ config CPU_FREQ ...@@ -356,20 +357,17 @@ config CPU_FREQ
written) to implement the policy. If you don't understand what this written) to implement the policy. If you don't understand what this
is all about, it's safe to say 'N'. is all about, it's safe to say 'N'.
source "drivers/cpufreq/Kconfig"
# CPUfreq on SA11x0 is special -- it _needs_ the userspace governor
config CPU_FREQ_SA1100 config CPU_FREQ_SA1100
bool bool
depends on CPU_FREQ && SA1100_LART depends on CPU_FREQ && SA1100_LART
default y default y
select CPU_FREQ_24_API if SYSCTL
config CPU_FREQ_SA1110 config CPU_FREQ_SA1110
bool bool
depends on CPU_FREQ && (SA1100_ASSABET || SA1100_CERF || SA1100_PT_SYSTEM3) depends on CPU_FREQ && (SA1100_ASSABET || SA1100_CERF || SA1100_PT_SYSTEM3)
default y default y
select CPU_FREQ_24_API if SYSCTL
config CPU_FREQ_INTEGRATOR config CPU_FREQ_INTEGRATOR
tristate "CPUfreq driver for ARM Integrator CPUs" tristate "CPUfreq driver for ARM Integrator CPUs"
...@@ -382,10 +380,6 @@ config CPU_FREQ_INTEGRATOR ...@@ -382,10 +380,6 @@ config CPU_FREQ_INTEGRATOR
If in doubt, say Y. If in doubt, say Y.
if (CPU_FREQ_INTEGRATOR) || (CPU_FREQ_SA1110) || (CPU_FREQ_SA1100)
source "drivers/cpufreq/Kconfig"
endif endif
source "drivers/pci/Kconfig" source "drivers/pci/Kconfig"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment