platform/x86: intel-uncore-frequency: Move to intel sub-directory

Move Intel Uncore frequency driver to intel sub-directory to improve
readability and rename it from intel-uncore-frequency.c to
uncore-frequency.c.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210820110458.73018-13-andriy.shevchenko@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index bb0fcf309cc8cd2f341bdb8b74a65e6a6fcedcbb..5fe92c8e92146402775110d5b48b0f9f3cac565f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9565,7 +9565,7 @@ INTEL UNCORE FREQUENCY CONTROL
 M:     Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
-F:     drivers/platform/x86/intel-uncore-frequency.c
+F:     drivers/platform/x86/intel/uncore-frequency.c
 
 INTEL VIRTUAL BUTTON DRIVER
 M:     AceLan Kao <acelan.kao@canonical.com>

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index a9acd44c2076ce06ce0057363c3b5c193ef47b3f..dc861ec59c3ac9dc38ba50d254e8e15e9f388b04 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1112,17 +1112,6 @@ config INTEL_IPS
 
 source "drivers/platform/x86/intel_speed_select_if/Kconfig"
 
-config INTEL_UNCORE_FREQ_CONTROL
-       tristate "Intel Uncore frequency control driver"
-       depends on X86_64
-       help
-         This driver allows control of uncore frequency limits on
-         supported server platforms.
-         Uncore frequency controls RING/LLC (last-level cache) clocks.
-
-         To compile this driver as a module, choose M here: the module
-         will be called intel-uncore-frequency.
-
 config INTEL_SCU_IPC
        bool
 

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 15d0754363ea46e60e17db779ac9876181a2e543..dfc5cde88999c27f39b9a073a545838f304dc6af 100644 (file)
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -121,7 +121,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/
-obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)                += intel-uncore-frequency.o
 
 # 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 701479386305cf6f507bdf39eba0c4d34d235853..7e3eb4404f7bdc7ca55fedbd74182e5cdf4fe796 100644 (file)
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -98,4 +98,16 @@ config INTEL_TURBO_MAX_3
          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
+       help
+         This driver allows control of Uncore frequency limits on
+         supported server platforms.
+
+         Uncore frequency controls RING/LLC (last-level cache) clocks.
+
+         To compile this driver as a module, choose M here: the module
+         will be called intel-uncore-frequency.
+
 endif # X86_PLATFORM_DRIVERS_INTEL

diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 1ecdf774e4907be76bbaa37edff5b50cd23c869b..8080e850c1fb823b2bf5393e99354525e2d62d08 100644 (file)
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -28,3 +28,5 @@ 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
+intel-uncore-frequency-y               := uncore-frequency.o
+obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)        += intel-uncore-frequency.o

diff --git a/drivers/platform/x86/intel-uncore-frequency.c b/drivers/platform/x86/intel/uncore-frequency.c
similarity index 100%
rename from drivers/platform/x86/intel-uncore-frequency.c
rename to drivers/platform/x86/intel/uncore-frequency.c