Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 1089eaa..69f93a5 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -587,6 +587,20 @@ config EEEPC_WMI
          If you have an ACPI-WMI compatible Eee PC laptop (>= 1000), say Y or M
          here.
 
+config ASUS_WIRELESS
+       tristate "Asus Wireless Radio Control Driver"
+       depends on ACPI
+       depends on INPUT
+       ---help---
+         The Asus Wireless Radio Control handles the airplane mode hotkey
+         present on some Asus laptops.
+
+         Say Y or M here if you have an ASUS notebook with an airplane mode
+         hotkey.
+
+         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
@@ -641,6 +655,7 @@ config ACPI_TOSHIBA
        depends on INPUT
        depends on SERIO_I8042 || SERIO_I8042 = n
        depends on ACPI_VIDEO || ACPI_VIDEO = n
+       depends on RFKILL || RFKILL = n
        select INPUT_POLLDEV
        select INPUT_SPARSEKMAP
        ---help---
@@ -731,6 +746,18 @@ config ACPI_CMPC
          keys as input device, backlight device, tablet and accelerometer
          devices.
 
+config INTEL_HID_EVENT
+       tristate "INTEL HID Event"
+       depends on ACPI
+       depends on INPUT
+       select INPUT_SPARSEKMAP
+       help
+         This driver provides support for the Intel HID Event hotkey interface.
+         Some laptops require this driver for hotkey support.
+
+         To compile this driver as a module, choose M here: the module will
+         be called intel_hid.
+
 config INTEL_SCU_IPC
        bool "Intel SCU IPC Support"
        depends on X86_INTEL_MID
@@ -940,8 +967,25 @@ config INTEL_PMC_IPC
        with other entities in the CPU.
 
 config SURFACE_PRO3_BUTTON
-       tristate "Power/home/volume buttons driver for Microsoft Surface Pro 3 tablet"
+       tristate "Power/home/volume buttons driver for Microsoft Surface Pro 3/4 tablet"
        depends on ACPI && INPUT
        ---help---
-         This driver handles the power/home/volume buttons on the Microsoft Surface Pro 3 tablet.
+         This driver handles the power/home/volume buttons on the Microsoft Surface Pro 3/4 tablet.
+
+config INTEL_PUNIT_IPC
+       tristate "Intel P-Unit IPC Driver"
+       ---help---
+         This driver provides support for Intel P-Unit Mailbox IPC mechanism,
+         which is used to bridge the communications between kernel and P-Unit.
+
+config INTEL_TELEMETRY
+       tristate "Intel SoC Telemetry Driver"
+       default n
+       depends on INTEL_PMC_IPC && INTEL_PUNIT_IPC && X86_64
+       ---help---
+         This driver provides interfaces to configure and use
+         telemetry for INTEL SoC from APL onwards. It is also
+         used to get various SoC events and parameters
+         directly via debugfs files. Various tools may use
+         this interface for SoC state monitoring.
 endif # X86_PLATFORM_DEVICES