From 6b1e482898e841b577d1d22b97fb65ac8ffacd9a Mon Sep 17 00:00:00 2001 From: Kate Hsuan Date: Fri, 20 Aug 2021 14:04:51 +0300 Subject: [PATCH] platform/x86: intel_speed_select_if: Move to intel sub-directory Move Intel Speed Select interface driver to intel sub-directory to improve readability and rename it from intel_speed_select_if to speed_select_if. Signed-off-by: Kate Hsuan Reviewed-by: Hans de Goede Signed-off-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210820110458.73018-14-andriy.shevchenko@linux.intel.com Signed-off-by: Hans de Goede --- MAINTAINERS | 2 +- drivers/platform/x86/Kconfig | 2 -- drivers/platform/x86/Makefile | 1 - drivers/platform/x86/intel/Kconfig | 1 + drivers/platform/x86/intel/Makefile | 1 + .../{intel_speed_select_if => intel/speed_select_if}/Kconfig | 0 .../{intel_speed_select_if => intel/speed_select_if}/Makefile | 0 .../speed_select_if}/isst_if_common.c | 0 .../speed_select_if}/isst_if_common.h | 0 .../speed_select_if}/isst_if_mbox_msr.c | 0 .../speed_select_if}/isst_if_mbox_pci.c | 0 .../speed_select_if}/isst_if_mmio.c | 0 12 files changed, 3 insertions(+), 4 deletions(-) rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/Kconfig (100%) rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/Makefile (100%) rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_common.c (100%) rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_common.h (100%) rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mbox_msr.c (100%) rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mbox_pci.c (100%) rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mmio.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 5fe92c8e92146..cf29f71548895 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9538,7 +9538,7 @@ INTEL SPEED SELECT TECHNOLOGY M: Srinivas Pandruvada L: platform-driver-x86@vger.kernel.org S: Maintained -F: drivers/platform/x86/intel_speed_select_if/ +F: drivers/platform/x86/intel/speed_select_if/ F: include/uapi/linux/isst_if.h F: tools/power/x86/intel-speed-select/ diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index dc861ec59c3ac..935116ef2df97 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -1110,8 +1110,6 @@ config INTEL_IPS functionality. If in doubt, say Y here; it will only load on supported platforms. -source "drivers/platform/x86/intel_speed_select_if/Kconfig" - config INTEL_SCU_IPC bool diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index dfc5cde88999c..dd3f1e683f0df 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -120,7 +120,6 @@ obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o # Intel uncore drivers obj-$(CONFIG_INTEL_IPS) += intel_ips.o -obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += intel_speed_select_if/ # Intel PMIC / PMC / P-Unit devices obj-$(CONFIG_INTEL_SCU_IPC) += intel_scu_ipc.o diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig index 7e3eb4404f7bd..2622653af37a6 100644 --- a/drivers/platform/x86/intel/Kconfig +++ b/drivers/platform/x86/intel/Kconfig @@ -21,6 +21,7 @@ source "drivers/platform/x86/intel/int33fe/Kconfig" source "drivers/platform/x86/intel/int3472/Kconfig" source "drivers/platform/x86/intel/pmc/Kconfig" source "drivers/platform/x86/intel/pmt/Kconfig" +source "drivers/platform/x86/intel/speed_select_if/Kconfig" source "drivers/platform/x86/intel/telemetry/Kconfig" config INTEL_BXTWC_PMIC_TMU diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile index 8080e850c1fb8..f5ac4a5f953f2 100644 --- a/drivers/platform/x86/intel/Makefile +++ b/drivers/platform/x86/intel/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_INTEL_CHT_INT33FE) += int33fe/ obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/ obj-$(CONFIG_INTEL_PMC_CORE) += pmc/ obj-$(CONFIG_INTEL_PMT_CLASS) += pmt/ +obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += speed_select_if/ obj-$(CONFIG_INTEL_TELEMETRY) += telemetry/ # Intel PMIC / PMC / P-Unit drivers diff --git a/drivers/platform/x86/intel_speed_select_if/Kconfig b/drivers/platform/x86/intel/speed_select_if/Kconfig similarity index 100% rename from drivers/platform/x86/intel_speed_select_if/Kconfig rename to drivers/platform/x86/intel/speed_select_if/Kconfig diff --git a/drivers/platform/x86/intel_speed_select_if/Makefile b/drivers/platform/x86/intel/speed_select_if/Makefile similarity index 100% rename from drivers/platform/x86/intel_speed_select_if/Makefile rename to drivers/platform/x86/intel/speed_select_if/Makefile diff --git a/drivers/platform/x86/intel_speed_select_if/isst_if_common.c b/drivers/platform/x86/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/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/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/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/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/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/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/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/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/speed_select_if/isst_if_mmio.c -- 2.30.2