platform/x86: intel-wmi-thunderbolt: Move to intel sub-directory

Move Intel WMI Thunderbolt 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-21-andriy.shevchenko@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 3ca5102ed811ebe2d82dd53f8cbba14817352bf6..60ee48c71c83e50dffa2a702a6952a3ddd11f7c1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9597,7 +9597,7 @@ F:        drivers/platform/x86/intel/wmi/sbl-fw-update.c
 INTEL WMI THUNDERBOLT FORCE POWER DRIVER
 L:     Dell.Client.Kernel@dell.com
 S:     Maintained
-F:     drivers/platform/x86/intel-wmi-thunderbolt.c
+F:     drivers/platform/x86/intel/wmi/thunderbolt.c
 
 INTEL WWAN IOSM DRIVER
 M:     M Chetan Kumar <m.chetan.kumar@intel.com>

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index d23053b6e29fa4ee2a39835a7a13880ab091a4f6..e21ea3d23e6f2235548e5ef23954e1e2f8fb3f97 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -77,18 +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_THUNDERBOLT
-       tristate "Intel WMI thunderbolt force power driver"
-       depends on ACPI_WMI
-       help
-         Say Y here if you want to be able to use the WMI interface on select
-         systems to force the power control of Intel Thunderbolt controllers.
-         This is useful for updating the firmware when devices are not plugged
-         into the controller.
-
-         To compile this driver as a module, choose M here: the module will
-         be called intel-wmi-thunderbolt.
-
 config MXM_WMI
        tristate "WMI support for MXM Laptop Graphics"
        depends on ACPI_WMI

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 29ab09e0f36bf290ecd59efe8d872153822fdb5b..69690e26bb6d4cc42c1a54f5fc4ff034e4a438c4 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_THUNDERBOLT)    += intel-wmi-thunderbolt.o
 obj-$(CONFIG_MXM_WMI)                  += mxm-wmi.o
 obj-$(CONFIG_PEAQ_WMI)                 += peaq-wmi.o
 obj-$(CONFIG_XIAOMI_WMI)               += xiaomi-wmi.o

diff --git a/drivers/platform/x86/intel/wmi/Kconfig b/drivers/platform/x86/intel/wmi/Kconfig
index c5753b1e8f432eadcb2c9abacbb1af0f472e57ba..8e159f712179d0f0eb84ea938c7aa92df1c3a1ce 100644 (file)
--- a/drivers/platform/x86/intel/wmi/Kconfig
+++ b/drivers/platform/x86/intel/wmi/Kconfig
@@ -16,3 +16,16 @@ config INTEL_WMI_SBL_FW_UPDATE
 
          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
+       select INTEL_WMI
+       help
+         Say Y here if you want to be able to use the WMI interface on select
+         systems to force the power control of Intel Thunderbolt controllers.
+         This is useful for updating the firmware when devices are not plugged
+         into the controller.
+
+         To compile this driver as a module, choose M here: the module will
+         be called intel-wmi-thunderbolt.

diff --git a/drivers/platform/x86/intel/wmi/Makefile b/drivers/platform/x86/intel/wmi/Makefile
index bf1f118b6839209abfbbfb4f072bdaec6248659a..c2d56d25dea0be3438ef1718c5e91f59991fdf0c 100644 (file)
--- a/drivers/platform/x86/intel/wmi/Makefile
+++ b/drivers/platform/x86/intel/wmi/Makefile
@@ -5,3 +5,5 @@
 
 intel-wmi-sbl-fw-update-y                              := sbl-fw-update.o
 obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)  += intel-wmi-sbl-fw-update.o
+intel-wmi-thunderbolt-y                                        := thunderbolt.o
+obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)    += intel-wmi-thunderbolt.o

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