platform/x86: intel-wmi-sbl-fw-update: Move to intel sub-directory

Move Intel WMI Slim Bootloader FW update driver to intel sub-directory
to improve readability.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210820110458.73018-20-andriy.shevchenko@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 4662d4d..3ca5102 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9592,7 +9592,7 @@ M:        Jithu Joseph <jithu.joseph@intel.com>
 R:     Maurice Ma <maurice.ma@intel.com>
 S:     Maintained
 W:     https://slimbootloader.github.io/security/firmware-update.html
-F:     drivers/platform/x86/intel-wmi-sbl-fw-update.c
+F:     drivers/platform/x86/intel/wmi/sbl-fw-update.c
 
 INTEL WMI THUNDERBOLT FORCE POWER DRIVER
 L:     Dell.Client.Kernel@dell.com

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index f1349a1..d23053b 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -77,16 +77,6 @@ config UV_SYSFS
          To compile this driver as a module, choose M here: the module will
          be called uv_sysfs.
 
-config INTEL_WMI_SBL_FW_UPDATE
-       tristate "Intel WMI Slim Bootloader firmware update signaling driver"
-       depends on ACPI_WMI
-       help
-         Say Y here if you want to be able to use the WMI interface to signal
-         Slim Bootloader to trigger update on next reboot.
-
-         To compile this driver as a module, choose M here: the module will
-         be called intel-wmi-sbl-fw-update.
-
 config INTEL_WMI_THUNDERBOLT
        tristate "Intel WMI thunderbolt force power driver"
        depends on ACPI_WMI

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index e6e888a..29ab09e 100644 (file)
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -10,7 +10,6 @@ obj-$(CONFIG_WMI_BMOF)                += wmi-bmof.o
 
 # WMI drivers
 obj-$(CONFIG_HUAWEI_WMI)               += huawei-wmi.o
-obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)  += intel-wmi-sbl-fw-update.o
 obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)    += intel-wmi-thunderbolt.o
 obj-$(CONFIG_MXM_WMI)                  += mxm-wmi.o
 obj-$(CONFIG_PEAQ_WMI)                 += peaq-wmi.o

diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index a5d71d6..0b21468 100644 (file)
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -24,6 +24,7 @@ source "drivers/platform/x86/intel/pmc/Kconfig"
 source "drivers/platform/x86/intel/pmt/Kconfig"
 source "drivers/platform/x86/intel/speed_select_if/Kconfig"
 source "drivers/platform/x86/intel/telemetry/Kconfig"
+source "drivers/platform/x86/intel/wmi/Kconfig"
 
 config INTEL_HID_EVENT
        tristate "Intel HID Event"

diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 67b1611..8b3a3f7 100644 (file)
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_INTEL_PMC_CORE)          += pmc/
 obj-$(CONFIG_INTEL_PMT_CLASS)          += pmt/
 obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += speed_select_if/
 obj-$(CONFIG_INTEL_TELEMETRY)          += telemetry/
+obj-$(CONFIG_INTEL_WMI)                        += wmi/
 
 # Intel input drivers
 intel-hid-y                            := hid.o

diff --git a/drivers/platform/x86/intel/wmi/Kconfig b/drivers/platform/x86/intel/wmi/Kconfig
new file mode 100644 (file)
index 0000000..c5753b1
--- /dev/null
+++ b/drivers/platform/x86/intel/wmi/Kconfig
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_WMI
+       bool
+
+config INTEL_WMI_SBL_FW_UPDATE
+       tristate "Intel WMI Slim Bootloader firmware update signaling driver"
+       depends on ACPI_WMI
+       select INTEL_WMI
+       help
+         Say Y here if you want to be able to use the WMI interface to signal
+         Slim Bootloader to trigger update on next reboot.
+
+         To compile this driver as a module, choose M here: the module will
+         be called intel-wmi-sbl-fw-update.

diff --git a/drivers/platform/x86/intel/wmi/Makefile b/drivers/platform/x86/intel/wmi/Makefile
new file mode 100644 (file)
index 0000000..bf1f118
--- /dev/null
+++ b/drivers/platform/x86/intel/wmi/Makefile
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+intel-wmi-sbl-fw-update-y                              := sbl-fw-update.o
+obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)  += intel-wmi-sbl-fw-update.o

diff --git a/drivers/platform/x86/intel-wmi-sbl-fw-update.c b/drivers/platform/x86/intel/wmi/sbl-fw-update.c
similarity index 100%
rename from drivers/platform/x86/intel-wmi-sbl-fw-update.c
rename to drivers/platform/x86/intel/wmi/sbl-fw-update.c