Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx>
---
drivers/platform/x86/Kconfig | 21 -------------------
drivers/platform/x86/Makefile | 2 --
drivers/platform/x86/intel/Kconfig | 1 +
drivers/platform/x86/intel/Makefile | 1 +
drivers/platform/x86/intel/rst/Kconfig | 16 ++++++++++++++
drivers/platform/x86/intel/rst/Makefile | 6 ++++++
.../platform/x86/{ => intel/rst}/intel-rst.c | 0
7 files changed, 24 insertions(+), 23 deletions(-)
create mode 100644 drivers/platform/x86/intel/rst/Kconfig
create mode 100644 drivers/platform/x86/intel/rst/Makefile
rename drivers/platform/x86/{ => intel/rst}/intel-rst.c (100%)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index b14c3a2953db..ffb3957c5b57 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1026,27 +1026,6 @@ config INTEL_IMR
If you are running on a Galileo/Quark say Y here.
-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.
-
-config INTEL_RST
- tristate "Intel Rapid Start Technology Driver"
- depends on ACPI
- help
- This driver provides support for modifying parameters on systems
- equipped with Intel's Rapid Start Technology. When put in an ACPI
- sleep state, these devices will wake after either a configured
- timeout or when the system battery reaches a critical state,
- automatically copying memory contents to disk. On resume, the
- firmware will copy the memory contents back to RAM and resume the OS
- as usual.
config INTEL_SMARTCONNECT
tristate "Intel Smart Connect disabling driver"
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index a755736341a0..d3ee3413ad13 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -113,8 +113,6 @@ obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o
obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o
# Intel uncore drivers
-
-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
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 5cbc1e4a4756..e16b93c8ea68 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -30,6 +30,7 @@ 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"
+source "drivers/platform/x86/intel/rst/Kconfig"
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index b87767623f94..335eb1bc7eaf 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -31,3 +31,4 @@ obj-$(CONFIG_INTEL_TELEMETRY) += telemetry/
# Intel uncore drivers
obj-$(CONFIG_INTEL_IPS) += ips/
+obj-$(CONFIG_INTEL_RST) += rst/
diff --git a/drivers/platform/x86/intel/rst/Kconfig b/drivers/platform/x86/intel/rst/Kconfig
new file mode 100644
index 000000000000..12265c2c9c32
--- /dev/null
+++ b/drivers/platform/x86/intel/rst/Kconfig
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_RST
+ tristate "Intel Rapid Start Technology Driver"
+ depends on ACPI
+ help
+ This driver provides support for modifying parameters on systems
+ equipped with Intel's Rapid Start Technology. When put in an ACPI
+ sleep state, these devices will wake after either a configured
+ timeout or when the system battery reaches a critical state,
+ automatically copying memory contents to disk. On resume, the
+ firmware will copy the memory contents back to RAM and resume the OS
+ as usual.
diff --git a/drivers/platform/x86/intel/rst/Makefile b/drivers/platform/x86/intel/rst/Makefile
new file mode 100644
index 000000000000..2dc6d16fca19
--- /dev/null
+++ b/drivers/platform/x86/intel/rst/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_RST) += intel-rst.o
diff --git a/drivers/platform/x86/intel-rst.c b/drivers/platform/x86/intel/rst/intel-rst.c
similarity index 100%
rename from drivers/platform/x86/intel-rst.c
rename to drivers/platform/x86/intel/rst/intel-rst.c
--
2.31.1
