To use acpi_cpufreq in both x86 and arm64, change the CONFIG_'s name and location.

Signed-off-by: Jonghwan Choi jhbird.choi@samsung.com --- drivers/cpufreq/Kconfig | 16 ++++++++++++++++ drivers/cpufreq/Kconfig.x86 | 26 +++++--------------------- drivers/cpufreq/Makefile | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index cb5b936..cbc7925 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -232,6 +232,22 @@ depends on ARM || ARM64 source "drivers/cpufreq/Kconfig.arm" endmenu

+config ACPI_CPUFREQ + tristate "ACPI Processor P-States driver" + depends on ACPI_PROCESSOR + help + This driver adds a CPUFreq driver which utilizes the ACPI + Processor Performance States. + This driver also supports Intel Enhanced Speedstep and newer + AMD CPUs. + + To compile this driver as a module, choose M here: the + module will be called acpi-cpufreq. + + For details, take a look at file:Documentation/cpu-freq/. + + If in doubt, say N. + menu "AVR32 CPU frequency scaling drivers" depends on AVR32

diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86 index d369349..fc3a3d7 100644 --- a/drivers/cpufreq/Kconfig.x86 +++ b/drivers/cpufreq/Kconfig.x86 @@ -29,26 +29,10 @@ config X86_PCC_CPUFREQ

If in doubt, say N.

-config X86_ACPI_CPUFREQ - tristate "ACPI Processor P-States driver" - depends on ACPI_PROCESSOR - help - This driver adds a CPUFreq driver which utilizes the ACPI - Processor Performance States. - This driver also supports Intel Enhanced Speedstep and newer - AMD CPUs. - - To compile this driver as a module, choose M here: the - module will be called acpi-cpufreq. - - For details, take a look at file:Documentation/cpu-freq/. - - If in doubt, say N. - config X86_ACPI_CPUFREQ_CPB default y bool "Legacy cpb sysfs knob support for AMD CPUs" - depends on X86_ACPI_CPUFREQ && CPU_SUP_AMD + depends on ACPI_CPUFREQ && CPU_SUP_AMD help The powernow-k8 driver used to provide a sysfs knob called "cpb" to disable the Core Performance Boosting feature of AMD CPUs. This @@ -113,7 +97,7 @@ config X86_POWERNOW_K7_ACPI

config X86_POWERNOW_K8 tristate "AMD Opteron/Athlon64 PowerNow!" - depends on ACPI && ACPI_PROCESSOR && X86_ACPI_CPUFREQ + depends on ACPI && ACPI_PROCESSOR && ACPI_CPUFREQ help This adds the CPUFreq driver for K8/early Opteron/Athlon64 processors. Support for K10 and newer processors is now in acpi-cpufreq. @@ -125,7 +109,7 @@ config X86_POWERNOW_K8

config X86_AMD_FREQ_SENSITIVITY tristate "AMD frequency sensitivity feedback powersave bias" - depends on CPU_FREQ_GOV_ONDEMAND && X86_ACPI_CPUFREQ && CPU_SUP_AMD + depends on CPU_FREQ_GOV_ONDEMAND && ACPI_CPUFREQ && CPU_SUP_AMD help This adds AMD-specific powersave bias function to the ondemand governor, which allows it to make more power-conscious frequency @@ -157,7 +141,7 @@ config X86_SPEEDSTEP_CENTRINO depends on X86_32 || (X86_64 && ACPI_PROCESSOR) help This is deprecated and this functionality is now merged into - acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of + acpi_cpufreq (ACPI_CPUFREQ). Use that driver instead of speedstep_centrino. This adds the CPUFreq driver for Enhanced SpeedStep enabled mobile CPUs. This means Intel Pentium M (Centrino) CPUs @@ -265,7 +249,7 @@ config X86_E_POWERSAVER This adds the CPUFreq driver for VIA C7 processors. However, this driver does not have any safeguards to prevent operating the CPU out of spec and is thus considered dangerous. Please use the regular ACPI cpufreq - driver, enabled by CONFIG_X86_ACPI_CPUFREQ. + driver, enabled by CONFIG_ACPI_CPUFREQ.

If in doubt, say N.

diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index 54a05c9..bfeb0fb 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -13,6 +13,7 @@ obj-$(CONFIG_CPU_FREQ_GOV_INTERACTIVE) += cpufreq_interactive.o obj-$(CONFIG_CPU_FREQ_GOV_COMMON) += cpufreq_governor.o

obj-$(CONFIG_GENERIC_CPUFREQ_CPU0) += cpufreq-cpu0.o +obj-$(CONFIG_ACPI_CPUFREQ) += acpi-cpufreq.o

############################################################################ ###### # x86 drivers. @@ -21,7 +22,6 @@ obj-$(CONFIG_GENERIC_CPUFREQ_CPU0) += cpufreq-cpu0.o # powernow-k8 can load then. ACPI is preferred to all other hardware-specific drivers. # speedstep-* is preferred over p4-clockmod.

-obj-$(CONFIG_X86_ACPI_CPUFREQ) += acpi-cpufreq.o obj-$(CONFIG_X86_POWERNOW_K8) += powernow-k8.o obj-$(CONFIG_X86_PCC_CPUFREQ) += pcc-cpufreq.o obj-$(CONFIG_X86_POWERNOW_K6) += powernow-k6.o