Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx>
---
drivers/platform/x86/Kconfig | 13 -------------
drivers/platform/x86/Makefile | 2 +-
drivers/platform/x86/intel/Kconfig | 1 +
drivers/platform/x86/intel/Makefile | 1 +
.../platform/x86/intel/smartconnect/Kconfig | 18 ++++++++++++++++++
.../platform/x86/intel/smartconnect/Makefile | 6 ++++++
.../smartconnect}/intel-smartconnect.c | 0
7 files changed, 27 insertions(+), 14 deletions(-)
create mode 100644 drivers/platform/x86/intel/smartconnect/Kconfig
create mode 100644 drivers/platform/x86/intel/smartconnect/Makefile
rename drivers/platform/x86/{ => intel/smartconnect}/intel-smartconnect.c (100%)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index ffb3957c5b57..f722f08cd89c 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1027,19 +1027,6 @@ config INTEL_IMR
If you are running on a Galileo/Quark say Y here.
-config INTEL_SMARTCONNECT
- tristate "Intel Smart Connect disabling driver"
- depends on ACPI
- help
- Intel Smart Connect is a technology intended to permit devices to
- update state by resuming for a short period of time at regular
- intervals. If a user enables this functionality under Windows and
- then reboots into Linux, the system may remain configured to resume
- on suspend. In the absence of any userspace to support it, the system
- will then remain awake until something triggers another suspend.
-
- This driver checks to determine whether the device has Intel Smart
- Connect enabled, and if so disables it.
source "drivers/platform/x86/intel_speed_select_if/Kconfig"
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index d3ee3413ad13..b809aaac300c 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -113,7 +113,7 @@ obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o
obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o
# Intel uncore drivers
-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
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index e16b93c8ea68..0ebc6e0a24ca 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -31,6 +31,7 @@ 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"
+source "drivers/platform/x86/intel/smartconnect/Kconfig"
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 335eb1bc7eaf..5a916bb1512f 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -32,3 +32,4 @@ obj-$(CONFIG_INTEL_TELEMETRY) += telemetry/
# Intel uncore drivers
obj-$(CONFIG_INTEL_IPS) += ips/
obj-$(CONFIG_INTEL_RST) += rst/
+obj-$(CONFIG_INTEL_SMARTCONNECT) += smartconnect/
diff --git a/drivers/platform/x86/intel/smartconnect/Kconfig b/drivers/platform/x86/intel/smartconnect/Kconfig
new file mode 100644
index 000000000000..2cc0c8504285
--- /dev/null
+++ b/drivers/platform/x86/intel/smartconnect/Kconfig
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_SMARTCONNECT
+ tristate "Intel Smart Connect disabling driver"
+ depends on ACPI
+ help
+ Intel Smart Connect is a technology intended to permit devices to
+ update state by resuming for a short period of time at regular
+ intervals. If a user enables this functionality under Windows and
+ then reboots into Linux, the system may remain configured to resume
+ on suspend. In the absence of any userspace to support it, the system
+ will then remain awake until something triggers another suspend.
+
+ This driver checks to determine whether the device has Intel Smart
+ Connect enabled, and if so disables it.
diff --git a/drivers/platform/x86/intel/smartconnect/Makefile b/drivers/platform/x86/intel/smartconnect/Makefile
new file mode 100644
index 000000000000..74ef29b5b714
--- /dev/null
+++ b/drivers/platform/x86/intel/smartconnect/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_SMARTCONNECT) += intel-smartconnect.o
\ No newline at end of file
diff --git a/drivers/platform/x86/intel-smartconnect.c b/drivers/platform/x86/intel/smartconnect/intel-smartconnect.c
similarity index 100%
rename from drivers/platform/x86/intel-smartconnect.c
rename to drivers/platform/x86/intel/smartconnect/intel-smartconnect.c
--
2.31.1
