Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx>
---
drivers/platform/x86/Kconfig | 15 ---------------
drivers/platform/x86/Makefile | 2 --
drivers/platform/x86/intel/Kconfig | 1 +
drivers/platform/x86/intel/Makefile | 19 +++++++++----------
drivers/platform/x86/intel/vbtn/Kconfig | 16 ++++++++++++++++
drivers/platform/x86/intel/vbtn/Makefile | 6 ++++++
.../x86/{ => intel/vbtn}/intel-vbtn.c | 0
7 files changed, 32 insertions(+), 27 deletions(-)
create mode 100644 drivers/platform/x86/intel/vbtn/Kconfig
create mode 100644 drivers/platform/x86/intel/vbtn/Makefile
rename drivers/platform/x86/{ => intel/vbtn}/intel-vbtn.c (100%)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 2426f8feb41f..a27584b77c52 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -632,21 +632,6 @@ config THINKPAD_LMI
source "drivers/platform/x86/intel/Kconfig"
-
-
-
-config INTEL_VBTN
- tristate "INTEL VIRTUAL BUTTON"
- depends on ACPI
- depends on INPUT
- select INPUT_SPARSEKMAP
- help
- This driver provides support for the Intel Virtual Button interface.
- Some laptops require this driver for power button support.
-
- To compile this driver as a module, choose M here: the module will
- be called intel_vbtn.
-
config MSI_LAPTOP
tristate "MSI Laptop Extras"
depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index d3992588408a..a797e3444e63 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -66,8 +66,6 @@ obj-$(CONFIG_THINKPAD_LMI) += think-lmi.o
# Intel
obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL) += intel/
-obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o
-
# MSI
obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
obj-$(CONFIG_MSI_WMI) += msi-wmi.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index afc0f70c45ac..2f376edab328 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -38,6 +38,7 @@ source "drivers/platform/x86/intel/uncore_freq/Kconfig"
source "drivers/platform/x86/intel/int0002/Kconfig"
source "drivers/platform/x86/intel/menlow/Kconfig"
source "drivers/platform/x86/intel/oaktrail/Kconfig"
+source "drivers/platform/x86/intel/vbtn/Kconfig"
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 6acf5db0e847..5decc9eb1b0e 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -12,8 +12,9 @@ obj-$(CONFIG_INTEL_HID_EVENT) += hid/
obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE) += wmi/
obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += wmi/
obj-$(CONFIG_INTEL_INT0002_VGPIO) += int0002/
-obj-$(CONFIG_INTEL_MENLOW) += menlow/
+obj-$(CONFIG_INTEL_MENLOW) += menlow/
obj-$(CONFIG_INTEL_OAKTRAIL) += oaktrail/
+obj-$(CONFIG_INTEL_VBTN) += vbtn/
# Intel PMIC / PMC / P-Unit devices
obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += bxtwc/
@@ -24,19 +25,17 @@ obj-$(CONFIG_INTEL_PMT_CLASS) += pmt/
obj-$(CONFIG_INTEL_PMT_TELEMETRY) += pmt/
obj-$(CONFIG_INTEL_PMT_CRASHLOG) += pmt/
obj-$(CONFIG_INTEL_PUNIT_IPC) += punit/
-obj-$(CONFIG_INTEL_SCU_IPC) += scu/
-obj-$(CONFIG_INTEL_SCU_PCI) += scu/
+obj-$(CONFIG_INTEL_SCU_IPC) += scu/
+obj-$(CONFIG_INTEL_SCU_PCI) += scu/
obj-$(CONFIG_INTEL_SCU_PLATFORM) += scu/
-obj-$(CONFIG_INTEL_SCU_WDT) += 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/
-obj-$(CONFIG_INTEL_RST) += rst/
-obj-$(CONFIG_INTEL_SMARTCONNECT) += smartconnect/
+obj-$(CONFIG_INTEL_IPS) += ips/
+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_TURBO_MAX_3) += turbo_max_3/
obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += uncore_freq/
-
-
diff --git a/drivers/platform/x86/intel/vbtn/Kconfig b/drivers/platform/x86/intel/vbtn/Kconfig
new file mode 100644
index 000000000000..c5dfd520530d
--- /dev/null
+++ b/drivers/platform/x86/intel/vbtn/Kconfig
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_VBTN
+ tristate "INTEL VIRTUAL BUTTON"
+ depends on ACPI
+ depends on INPUT
+ select INPUT_SPARSEKMAP
+ help
+ This driver provides support for the Intel Virtual Button interface.
+ Some laptops require this driver for power button support.
+
+ To compile this driver as a module, choose M here: the module will
+ be called intel_vbtn.
diff --git a/drivers/platform/x86/intel/vbtn/Makefile b/drivers/platform/x86/intel/vbtn/Makefile
new file mode 100644
index 000000000000..596833e13a31
--- /dev/null
+++ b/drivers/platform/x86/intel/vbtn/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o
diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel/vbtn/intel-vbtn.c
similarity index 100%
rename from drivers/platform/x86/intel-vbtn.c
rename to drivers/platform/x86/intel/vbtn/intel-vbtn.c
--
2.31.1
