Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx> --- drivers/platform/x86/Kconfig | 2 -- drivers/platform/x86/Makefile | 2 +- drivers/platform/x86/intel/Kconfig | 1 + drivers/platform/x86/intel/Makefile | 1 + drivers/platform/x86/{ => intel}/intel_speed_select_if/Kconfig | 0 drivers/platform/x86/{ => intel}/intel_speed_select_if/Makefile | 0 .../x86/{ => intel}/intel_speed_select_if/isst_if_common.c | 0 .../x86/{ => intel}/intel_speed_select_if/isst_if_common.h | 0 .../x86/{ => intel}/intel_speed_select_if/isst_if_mbox_msr.c | 0 .../x86/{ => intel}/intel_speed_select_if/isst_if_mbox_pci.c | 0 .../x86/{ => intel}/intel_speed_select_if/isst_if_mmio.c | 0 11 files changed, 3 insertions(+), 3 deletions(-) rename drivers/platform/x86/{ => intel}/intel_speed_select_if/Kconfig (100%) rename drivers/platform/x86/{ => intel}/intel_speed_select_if/Makefile (100%) rename drivers/platform/x86/{ => intel}/intel_speed_select_if/isst_if_common.c (100%) rename drivers/platform/x86/{ => intel}/intel_speed_select_if/isst_if_common.h (100%) rename drivers/platform/x86/{ => intel}/intel_speed_select_if/isst_if_mbox_msr.c (100%) rename drivers/platform/x86/{ => intel}/intel_speed_select_if/isst_if_mbox_pci.c (100%) rename drivers/platform/x86/{ => intel}/intel_speed_select_if/isst_if_mmio.c (100%) diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index f722f08cd89c..ff0a36a61404 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -1028,8 +1028,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 diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index b809aaac300c..2ce50bae6b71 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -114,7 +114,7 @@ obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o # Intel uncore drivers -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 0ebc6e0a24ca..f6c326d33ea0 100644 --- a/drivers/platform/x86/intel/Kconfig +++ b/drivers/platform/x86/intel/Kconfig @@ -32,6 +32,7 @@ source "drivers/platform/x86/intel/telemetry/Kconfig" source "drivers/platform/x86/intel/ips/Kconfig" source "drivers/platform/x86/intel/rst/Kconfig" source "drivers/platform/x86/intel/smartconnect/Kconfig" +source "drivers/platform/x86/intel/intel_speed_select_if/Kconfig" endif # X86_PLATFORM_DRIVERS_INTEL diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile index 5a916bb1512f..972076bdcd4e 100644 --- a/drivers/platform/x86/intel/Makefile +++ b/drivers/platform/x86/intel/Makefile @@ -33,3 +33,4 @@ obj-$(CONFIG_INTEL_TELEMETRY) += telemetry/ obj-$(CONFIG_INTEL_IPS) += ips/ obj-$(CONFIG_INTEL_RST) += rst/ obj-$(CONFIG_INTEL_SMARTCONNECT) += smartconnect/ +obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += intel_speed_select_if/ \ No newline at end of file diff --git a/drivers/platform/x86/intel_speed_select_if/Kconfig b/drivers/platform/x86/intel/intel_speed_select_if/Kconfig similarity index 100% rename from drivers/platform/x86/intel_speed_select_if/Kconfig rename to drivers/platform/x86/intel/intel_speed_select_if/Kconfig diff --git a/drivers/platform/x86/intel_speed_select_if/Makefile b/drivers/platform/x86/intel/intel_speed_select_if/Makefile similarity index 100% rename from drivers/platform/x86/intel_speed_select_if/Makefile rename to drivers/platform/x86/intel/intel_speed_select_if/Makefile diff --git a/drivers/platform/x86/intel_speed_select_if/isst_if_common.c b/drivers/platform/x86/intel/intel_speed_select_if/isst_if_common.c similarity index 100% rename from drivers/platform/x86/intel_speed_select_if/isst_if_common.c rename to drivers/platform/x86/intel/intel_speed_select_if/isst_if_common.c diff --git a/drivers/platform/x86/intel_speed_select_if/isst_if_common.h b/drivers/platform/x86/intel/intel_speed_select_if/isst_if_common.h similarity index 100% rename from drivers/platform/x86/intel_speed_select_if/isst_if_common.h rename to drivers/platform/x86/intel/intel_speed_select_if/isst_if_common.h diff --git a/drivers/platform/x86/intel_speed_select_if/isst_if_mbox_msr.c b/drivers/platform/x86/intel/intel_speed_select_if/isst_if_mbox_msr.c similarity index 100% rename from drivers/platform/x86/intel_speed_select_if/isst_if_mbox_msr.c rename to drivers/platform/x86/intel/intel_speed_select_if/isst_if_mbox_msr.c diff --git a/drivers/platform/x86/intel_speed_select_if/isst_if_mbox_pci.c b/drivers/platform/x86/intel/intel_speed_select_if/isst_if_mbox_pci.c similarity index 100% rename from drivers/platform/x86/intel_speed_select_if/isst_if_mbox_pci.c rename to drivers/platform/x86/intel/intel_speed_select_if/isst_if_mbox_pci.c diff --git a/drivers/platform/x86/intel_speed_select_if/isst_if_mmio.c b/drivers/platform/x86/intel/intel_speed_select_if/isst_if_mmio.c similarity index 100% rename from drivers/platform/x86/intel_speed_select_if/isst_if_mmio.c rename to drivers/platform/x86/intel/intel_speed_select_if/isst_if_mmio.c -- 2.31.1