Move intel-rst to intel sub-directory to improve readability
and rename it from intel-rst.c to ips.c
Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx>
---
drivers/platform/x86/Kconfig | 12 ------------
drivers/platform/x86/Makefile | 2 +-
drivers/platform/x86/intel/Kconfig | 12 ++++++++++++
drivers/platform/x86/intel/Makefile | 3 ++-
drivers/platform/x86/{intel-rst.c => intel/rst.c} | 0
5 files changed, 15 insertions(+), 14 deletions(-)
rename drivers/platform/x86/{intel-rst.c => intel/rst.c} (100%)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index eca113f6dd0c..c3682ea48af0 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1109,18 +1109,6 @@ config INTEL_IMR
If you are running on a Galileo/Quark say Y here.
-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"
depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index fdbaaf9486df..16d9f142ca7a 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -121,7 +121,7 @@ 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 300fc8bbc907..b0b2566be981 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -72,4 +72,16 @@ config INTEL_IPS
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.
+
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index adb61cf3a387..cc72262d9283 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -29,6 +29,7 @@ obj-$(CONFIG_INTEL_TELEMETRY) += telemetry/
CFLAGS_ips.o := -I./drivers/platform/x86
intel_ips-y := ips.o
obj-$(CONFIG_INTEL_IPS) += intel_ips.o
-
+intel-rst-y := rst.o
+obj-$(CONFIG_INTEL_RST) += intel-rst.o
diff --git a/drivers/platform/x86/intel-rst.c b/drivers/platform/x86/intel/rst.c
similarity index 100%
rename from drivers/platform/x86/intel-rst.c
rename to drivers/platform/x86/intel/rst.c
--
2.31.1
