Skip to content

Commit

Permalink
[CPUFREQ] Move x86 drivers to drivers/cpufreq/
Browse files Browse the repository at this point in the history
Signed-off-by: Dave Jones <[email protected]>
  • Loading branch information
Dave Jones committed May 19, 2011
1 parent 1a8e146 commit bb0a56e
Show file tree
Hide file tree
Showing 29 changed files with 37 additions and 36 deletions.
2 changes: 1 addition & 1 deletion arch/x86/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1848,7 +1848,7 @@ config APM_ALLOW_INTS

endif # APM

source "arch/x86/kernel/cpu/cpufreq/Kconfig"
source "drivers/cpufreq/Kconfig"

source "drivers/cpuidle/Kconfig"

Expand Down
1 change: 0 additions & 1 deletion arch/x86/kernel/cpu/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ obj-$(CONFIG_PERF_EVENTS) += perf_event.o

obj-$(CONFIG_X86_MCE) += mcheck/
obj-$(CONFIG_MTRR) += mtrr/
obj-$(CONFIG_CPU_FREQ) += cpufreq/

obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o

Expand Down
21 changes: 0 additions & 21 deletions arch/x86/kernel/cpu/cpufreq/Makefile

This file was deleted.

10 changes: 9 additions & 1 deletion drivers/cpufreq/Kconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
menu "CPU Frequency scaling"

config CPU_FREQ
bool "CPU Frequency scaling"
help
Expand Down Expand Up @@ -177,4 +179,10 @@ config CPU_FREQ_GOV_CONSERVATIVE

If in doubt, say N.

endif # CPU_FREQ
menu "x86 CPU frequency scaling drivers"
depends on X86
source "drivers/cpufreq/Kconfig.x86"
endmenu

endif
endmenu
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
#
# CPU Frequency scaling
# x86 CPU Frequency scaling drivers
#

menu "CPU Frequency scaling"

source "drivers/cpufreq/Kconfig"

if CPU_FREQ

comment "CPUFreq processor drivers"

config X86_PCC_CPUFREQ
tristate "Processor Clocking Control interface driver"
depends on ACPI && ACPI_PROCESSOR
Expand Down Expand Up @@ -261,6 +253,3 @@ config X86_SPEEDSTEP_RELAXED_CAP_CHECK
option lets the probing code bypass some of those checks if the
parameter "relaxed_check=1" is passed to the module.

endif # CPU_FREQ

endmenu
26 changes: 26 additions & 0 deletions drivers/cpufreq/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,29 @@ obj-$(CONFIG_CPU_FREQ_GOV_CONSERVATIVE) += cpufreq_conservative.o
# CPUfreq cross-arch helpers
obj-$(CONFIG_CPU_FREQ_TABLE) += freq_table.o

##################################################################################d
# x86 drivers.
# Link order matters. K8 is preferred to ACPI because of firmware bugs in early
# K8 systems. ACPI is preferred to all other hardware-specific drivers.
# speedstep-* is preferred over p4-clockmod.

obj-$(CONFIG_X86_POWERNOW_K8) += powernow-k8.o mperf.o
obj-$(CONFIG_X86_ACPI_CPUFREQ) += acpi-cpufreq.o mperf.o
obj-$(CONFIG_X86_PCC_CPUFREQ) += pcc-cpufreq.o
obj-$(CONFIG_X86_POWERNOW_K6) += powernow-k6.o
obj-$(CONFIG_X86_POWERNOW_K7) += powernow-k7.o
obj-$(CONFIG_X86_LONGHAUL) += longhaul.o
obj-$(CONFIG_X86_E_POWERSAVER) += e_powersaver.o
obj-$(CONFIG_ELAN_CPUFREQ) += elanfreq.o
obj-$(CONFIG_SC520_CPUFREQ) += sc520_freq.o
obj-$(CONFIG_X86_LONGRUN) += longrun.o
obj-$(CONFIG_X86_GX_SUSPMOD) += gx-suspmod.o
obj-$(CONFIG_X86_SPEEDSTEP_ICH) += speedstep-ich.o
obj-$(CONFIG_X86_SPEEDSTEP_LIB) += speedstep-lib.o
obj-$(CONFIG_X86_SPEEDSTEP_SMI) += speedstep-smi.o
obj-$(CONFIG_X86_SPEEDSTEP_CENTRINO) += speedstep-centrino.o
obj-$(CONFIG_X86_P4_CLOCKMOD) += p4-clockmod.o
obj-$(CONFIG_X86_CPUFREQ_NFORCE2) += cpufreq-nforce2.o

##################################################################################d

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit bb0a56e

Please sign in to comment.