diff options
| author | Kate Hsuan <hpa@redhat.com> | 2021-08-20 14:04:58 +0300 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2021-08-20 21:11:23 +0300 |
| commit | 95c3e4b4282a4033ff3b0fe64bd4d2a2f3f0d31d (patch) | |
| tree | c6e286a3099f01ac9d4826658d8e03c8204e6813 /drivers/platform | |
| parent | bd5b4fb47dde86b5e04686463dc2420e5ed6932a (diff) | |
| download | linux-95c3e4b4282a4033ff3b0fe64bd4d2a2f3f0d31d.tar.xz | |
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>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/platform/x86/Makefile | 1 | ||||
| -rw-r--r-- | drivers/platform/x86/intel/wmi/Kconfig | 13 | ||||
| -rw-r--r-- | drivers/platform/x86/intel/wmi/Makefile | 2 | ||||
| -rw-r--r-- | drivers/platform/x86/intel/wmi/thunderbolt.c (renamed from drivers/platform/x86/intel-wmi-thunderbolt.c) | 0 |
5 files changed, 15 insertions, 13 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index d23053b6e29f..e21ea3d23e6f 100644 --- 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 29ab09e0f36b..69690e26bb6d 100644 --- 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 c5753b1e8f43..8e159f712179 100644 --- 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 bf1f118b6839..c2d56d25dea0 100644 --- 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 index 4ae87060d18b..4ae87060d18b 100644 --- a/drivers/platform/x86/intel-wmi-thunderbolt.c +++ b/drivers/platform/x86/intel/wmi/thunderbolt.c |