platform/x86/intel/uncore-freq: Move to uncore-frequency folder

Move the current driver from platform/x86/intel/uncore-frequency.c
to platform/x86/intel/uncore-frequency/uncore-frequency.c.

No functional changes are expected.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/r/20220204000306.2517447-2-srinivas.pandruvada@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index c812f95..136f817 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9908,7 +9908,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/
 
 INTEL VENDOR SPECIFIC EXTENDED CAPABILITIES DRIVER
 M:     David E. Box <david.e.box@linux.intel.com>

diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 205ebb5..1f01a8a 100644 (file)
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -11,6 +11,8 @@ source "drivers/platform/x86/intel/pmt/Kconfig"
 source "drivers/platform/x86/intel/speed_select_if/Kconfig"
 source "drivers/platform/x86/intel/telemetry/Kconfig"
 source "drivers/platform/x86/intel/wmi/Kconfig"
+source "drivers/platform/x86/intel/uncore-frequency/Kconfig"
+
 
 config INTEL_HID_EVENT
        tristate "Intel HID Event"
@@ -190,18 +192,6 @@ 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.
-
 config INTEL_VSEC
        tristate "Intel Vendor Specific Extended Capabilities Driver"
        depends on PCI

diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 1a5cdba..c61bc3e 100644 (file)
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -12,6 +12,8 @@ obj-$(CONFIG_INTEL_PMT_CLASS)         += pmt/
 obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += speed_select_if/
 obj-$(CONFIG_INTEL_TELEMETRY)          += telemetry/
 obj-$(CONFIG_INTEL_WMI)                        += wmi/
+obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)        += uncore-frequency/
+
 
 # Intel input drivers
 intel-hid-y                            := hid.o
@@ -51,5 +53,3 @@ 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/Kconfig b/drivers/platform/x86/intel/uncore-frequency/Kconfig
new file mode 100644 (file)
index 0000000..21b2091
--- /dev/null
+++ b/drivers/platform/x86/intel/uncore-frequency/Kconfig
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Uncore Frquency control drivers
+#
+
+menu "Intel Uncore Frequency Control"
+       depends on X86_64 || COMPILE_TEST
+
+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.
+
+endmenu

diff --git a/drivers/platform/x86/intel/uncore-frequency/Makefile b/drivers/platform/x86/intel/uncore-frequency/Makefile
new file mode 100644 (file)
index 0000000..e22186a
--- /dev/null
+++ b/drivers/platform/x86/intel/uncore-frequency/Makefile
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for linux/drivers/platform/x86/intel/uncore-frequency
+#
+
+obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)        += intel-uncore-frequency.o
+intel-uncore-frequency-y               := uncore-frequency.o

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