From: Ard Biesheuvel ard.biesheuvel@linaro.org
WMI is now used on arm64 ACPI laptops as well, so move the support code to drivers/acpi
Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org Signed-off-by: Dimitri John Ledkov xnox@ubuntu.com --- drivers/acpi/Kconfig | 21 +++++++++++++++++++++ drivers/acpi/Makefile | 1 + drivers/{platform/x86 => acpi}/wmi.c | 0 drivers/platform/x86/Kconfig | 21 --------------------- drivers/platform/x86/Makefile | 1 - 5 files changed, 22 insertions(+), 22 deletions(-) rename drivers/{platform/x86 => acpi}/wmi.c (100%)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 5f6158973289..8955bdd8d693 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -576,6 +576,27 @@ config TPS68470_PMIC_OPREGION region, which must be available before any of the devices using this, are probed.
+config ACPI_WMI + tristate "WMI" + depends on ACPI + help + This driver adds support for the ACPI-WMI (Windows Management + Instrumentation) mapper device (PNP0C14) found on some systems. + + ACPI-WMI is a proprietary extension to ACPI to expose parts of the + ACPI firmware to userspace - this is done through various vendor + defined methods and data blocks in a PNP0C14 device, which are then + made available for userspace to call. + + The implementation of this in Linux currently only exposes this to + other kernel space drivers. + + This driver is a required dependency to build the firmware specific + drivers needed on many machines, including Acer and HP laptops. + + It is safe to enable this driver even if your DSDT doesn't define + any ACPI-WMI devices. + endif # ACPI
config X86_PM_TIMER diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 5d361e4e3405..480ae10374de 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -94,6 +94,7 @@ obj-$(CONFIG_ACPI_CPPC_LIB) += cppc_acpi.o obj-$(CONFIG_ACPI_SPCR_TABLE) += spcr.o obj-$(CONFIG_ACPI_DEBUGGER_USER) += acpi_dbg.o obj-$(CONFIG_ACPI_PPTT) += pptt.o +obj-$(CONFIG_ACPI_WMI) += wmi.o
# processor has its own "processor." module_param namespace processor-y := processor_driver.o diff --git a/drivers/platform/x86/wmi.c b/drivers/acpi/wmi.c similarity index 100% rename from drivers/platform/x86/wmi.c rename to drivers/acpi/wmi.c diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 27696d68abe8..74421eacb5e6 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -747,27 +747,6 @@ config ASUS_WIRELESS If you choose to compile this driver as a module the module will be called asus-wireless.
-config ACPI_WMI - tristate "WMI" - depends on ACPI - help - This driver adds support for the ACPI-WMI (Windows Management - Instrumentation) mapper device (PNP0C14) found on some systems. - - ACPI-WMI is a proprietary extension to ACPI to expose parts of the - ACPI firmware to userspace - this is done through various vendor - defined methods and data blocks in a PNP0C14 device, which are then - made available for userspace to call. - - The implementation of this in Linux currently only exposes this to - other kernel space drivers. - - This driver is a required dependency to build the firmware specific - drivers needed on many machines, including Acer and HP laptops. - - It is safe to enable this driver even if your DSDT doesn't define - any ACPI-WMI devices. - config WMI_BMOF tristate "WMI embedded Binary MOF driver" depends on ACPI_WMI diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index a7163e313ecc..09a7c704004d 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -45,7 +45,6 @@ obj-$(CONFIG_FUJITSU_LAPTOP) += fujitsu-laptop.o obj-$(CONFIG_FUJITSU_TABLET) += fujitsu-tablet.o obj-$(CONFIG_PANASONIC_LAPTOP) += panasonic-laptop.o obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o -obj-$(CONFIG_ACPI_WMI) += wmi.o obj-$(CONFIG_MSI_WMI) += msi-wmi.o obj-$(CONFIG_PEAQ_WMI) += peaq-wmi.o obj-$(CONFIG_SURFACE3_WMI) += surface3-wmi.o