Move intel_turbo_max_3 to intel sub-directory to improve readability and rename it from intel_turbo_max_3.c to turbo_max_3.c Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx> --- drivers/platform/x86/Kconfig | 10 ---------- drivers/platform/x86/Makefile | 2 +- drivers/platform/x86/intel/Kconfig | 10 ++++++++++ drivers/platform/x86/intel/Makefile | 4 ++-- .../x86/{intel_turbo_max_3.c => intel/turbo_max_3.c} | 0 5 files changed, 13 insertions(+), 13 deletions(-) rename drivers/platform/x86/{intel_turbo_max_3.c => intel/turbo_max_3.c} (100%) diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 0edd59ffb6b6..b34bfa5c5748 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -1101,16 +1101,6 @@ config INTEL_IMR source "drivers/platform/x86/intel_speed_select_if/Kconfig" -config INTEL_TURBO_MAX_3 - bool "Intel Turbo Boost Max Technology 3.0 enumeration driver" - depends on X86_64 && SCHED_MC_PRIO - help - This driver reads maximum performance ratio of each CPU and set up - the scheduler priority metrics. In this way scheduler can prefer - CPU with higher performance to schedule tasks. - This driver is only required when the system is not using Hardware - P-States (HWP). In HWP mode, priority can be read from ACPI tables. - config INTEL_UNCORE_FREQ_CONTROL tristate "Intel Uncore frequency control driver" depends on X86_64 diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 6082d4d1dad8..a57fbf26646a 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -122,7 +122,7 @@ obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += intel_speed_select_if/ -obj-$(CONFIG_INTEL_TURBO_MAX_3) += intel_turbo_max_3.o + obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig index 481811ea4bf8..2943619d9018 100644 --- a/drivers/platform/x86/intel/Kconfig +++ b/drivers/platform/x86/intel/Kconfig @@ -99,4 +99,14 @@ config INTEL_SMARTCONNECT Connect enabled, and if so disables it. +config INTEL_TURBO_MAX_3 + bool "Intel Turbo Boost Max Technology 3.0 enumeration driver" + depends on X86_64 && SCHED_MC_PRIO + help + This driver reads maximum performance ratio of each CPU and set up + the scheduler priority metrics. In this way scheduler can prefer + CPU with higher performance to schedule tasks. + This driver is only required when the system is not using Hardware + P-States (HWP). In HWP mode, priority can be read from ACPI tables. + endif # X86_PLATFORM_DRIVERS_INTEL diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile index 53d55a9b17b9..58ccb1f8cbd0 100644 --- a/drivers/platform/x86/intel/Makefile +++ b/drivers/platform/x86/intel/Makefile @@ -32,5 +32,5 @@ intel-rst-y := rst.o obj-$(CONFIG_INTEL_RST) += intel-rst.o intel-smartconnect-y := smartconnect.o obj-$(CONFIG_INTEL_SMARTCONNECT) += intel-smartconnect.o - - +intel_turbo_max_3-y := turbo_max_3.o +obj-$(CONFIG_INTEL_TURBO_MAX_3) += intel_turbo_max_3.o diff --git a/drivers/platform/x86/intel_turbo_max_3.c b/drivers/platform/x86/intel/turbo_max_3.c similarity index 100% rename from drivers/platform/x86/intel_turbo_max_3.c rename to drivers/platform/x86/intel/turbo_max_3.c -- 2.31.1