Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx>
---
drivers/platform/x86/Makefile | 7 +------
drivers/platform/x86/intel/Kconfig | 1 +
drivers/platform/x86/intel/Makefile | 3 +++
drivers/platform/x86/intel/ips/Kconfig | 14 ++++++++++++++
drivers/platform/x86/intel/ips/Makefile | 6 ++++++
drivers/platform/x86/{ => intel/ips}/intel_ips.c | 0
drivers/platform/x86/{ => intel/ips}/intel_ips.h | 0
7 files changed, 25 insertions(+), 6 deletions(-)
create mode 100644 drivers/platform/x86/intel/ips/Kconfig
create mode 100644 drivers/platform/x86/intel/ips/Makefile
rename drivers/platform/x86/{ => intel/ips}/intel_ips.c (100%)
rename drivers/platform/x86/{ => intel/ips}/intel_ips.h (100%)
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 1d7acccf5e3a..a755736341a0 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -113,17 +113,12 @@ obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o
obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o
# Intel uncore drivers
-obj-$(CONFIG_INTEL_IPS) += intel_ips.o
+
obj-$(CONFIG_INTEL_RST) += intel-rst.o
obj-$(CONFIG_INTEL_SMARTCONNECT) += intel-smartconnect.o
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
-# Intel PMIC / PMC / P-Unit devices
-
-
-
-
obj-$(CONFIG_PMC_ATOM) += pmc_atom.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 02e7792d34b0..5cbc1e4a4756 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -29,6 +29,7 @@ source "drivers/platform/x86/intel/pmt/Kconfig"
source "drivers/platform/x86/intel/punit/Kconfig"
source "drivers/platform/x86/intel/scu/Kconfig"
source "drivers/platform/x86/intel/telemetry/Kconfig"
+source "drivers/platform/x86/intel/ips/Kconfig"
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 3edbd5209072..b87767623f94 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -28,3 +28,6 @@ obj-$(CONFIG_INTEL_SCU_PLATFORM) += scu/
obj-$(CONFIG_INTEL_SCU_WDT) += scu/
obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += scu/
obj-$(CONFIG_INTEL_TELEMETRY) += telemetry/
+
+# Intel uncore drivers
+obj-$(CONFIG_INTEL_IPS) += ips/
diff --git a/drivers/platform/x86/intel/ips/Kconfig b/drivers/platform/x86/intel/ips/Kconfig
new file mode 100644
index 000000000000..3417f3586d73
--- /dev/null
+++ b/drivers/platform/x86/intel/ips/Kconfig
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_IPS
+ tristate "Intel Intelligent Power Sharing"
+ depends on ACPI && PCI
+ help
+ Intel Calpella platforms support dynamic power sharing between the
+ CPU and GPU, maximizing performance in a given TDP. This driver,
+ along with the CPU frequency and i915 drivers, provides that
+ functionality. If in doubt, say Y here; it will only load on
+ supported platforms.
\ No newline at end of file
diff --git a/drivers/platform/x86/intel/ips/Makefile b/drivers/platform/x86/intel/ips/Makefile
new file mode 100644
index 000000000000..a76450b840c8
--- /dev/null
+++ b/drivers/platform/x86/intel/ips/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_IPS) += intel_ips.o
\ No newline at end of file
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel/ips/intel_ips.c
similarity index 100%
rename from drivers/platform/x86/intel_ips.c
rename to drivers/platform/x86/intel/ips/intel_ips.c
diff --git a/drivers/platform/x86/intel_ips.h b/drivers/platform/x86/intel/ips/intel_ips.h
similarity index 100%
rename from drivers/platform/x86/intel_ips.h
rename to drivers/platform/x86/intel/ips/intel_ips.h
--
2.31.1
