Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx>
---
drivers/platform/x86/Kconfig | 13 -------------
drivers/platform/x86/Makefile | 5 -----
drivers/platform/x86/intel/Kconfig | 1 +
drivers/platform/x86/intel/Makefile | 1 +
drivers/platform/x86/intel/uncore_freq/Kconfig | 15 +++++++++++++++
drivers/platform/x86/intel/uncore_freq/Makefile | 6 ++++++
.../uncore_freq}/intel-uncore-frequency.c | 0
7 files changed, 23 insertions(+), 18 deletions(-)
create mode 100644 drivers/platform/x86/intel/uncore_freq/Kconfig
create mode 100644 drivers/platform/x86/intel/uncore_freq/Makefile
rename drivers/platform/x86/{ => intel/uncore_freq}/intel-uncore-frequency.c (100%)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 735949c406d3..ba760d1cb873 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1026,19 +1026,6 @@ config INTEL_IMR
If you are running on a Galileo/Quark say Y here.
-
-
-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_DEVICES
config PMC_ATOM
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index e3ea8bf3647b..a657eef9e10f 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -112,10 +112,5 @@ obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o
obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o
obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o
-# Intel uncore drivers
-
-
-obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o
-
obj-$(CONFIG_PMC_ATOM) += pmc_atom.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index d3f1be45a25f..f1f09c7bd992 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -34,6 +34,7 @@ source "drivers/platform/x86/intel/rst/Kconfig"
source "drivers/platform/x86/intel/smartconnect/Kconfig"
source "drivers/platform/x86/intel/intel_speed_select_if/Kconfig"
source "drivers/platform/x86/intel/turbo_max_3/Kconfig"
+source "drivers/platform/x86/intel/uncore_freq/Kconfig"
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 040109e2908a..a4993248cfde 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -35,3 +35,4 @@ obj-$(CONFIG_INTEL_RST) += rst/
obj-$(CONFIG_INTEL_SMARTCONNECT) += smartconnect/
obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += intel_speed_select_if/
obj-$(CONFIG_INTEL_TURBO_MAX_3) += turbo_max_3/
+obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += uncore_freq/
diff --git a/drivers/platform/x86/intel/uncore_freq/Kconfig b/drivers/platform/x86/intel/uncore_freq/Kconfig
new file mode 100644
index 000000000000..dd237195fb81
--- /dev/null
+++ b/drivers/platform/x86/intel/uncore_freq/Kconfig
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+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.
diff --git a/drivers/platform/x86/intel/uncore_freq/Makefile b/drivers/platform/x86/intel/uncore_freq/Makefile
new file mode 100644
index 000000000000..c1516bed69e5
--- /dev/null
+++ b/drivers/platform/x86/intel/uncore_freq/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+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_freq/intel-uncore-frequency.c
similarity index 100%
rename from drivers/platform/x86/intel-uncore-frequency.c
rename to drivers/platform/x86/intel/uncore_freq/intel-uncore-frequency.c
--
2.31.1
