Merge tag 'platform-drivers-x86-v4.12-1' of git://git.infradead.org/linux-platform...

[mirror_ubuntu-artful-kernel.git] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 883fbe7a246675c48e78cb2f1582ac23f825062b..8489020ecf44589bef11a87f22e980440400514a 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -182,7 +182,8 @@ config FUJITSU_LAPTOP
        depends on INPUT
        depends on BACKLIGHT_CLASS_DEVICE
        depends on ACPI_VIDEO || ACPI_VIDEO = n
-       depends on LEDS_CLASS || LEDS_CLASS=n
+       select INPUT_SPARSEKMAP
+       select LEDS_CLASS
        ---help---
          This is a driver for laptops built by Fujitsu:
 
@@ -780,6 +781,19 @@ config ACPI_CMPC
          keys as input device, backlight device, tablet and accelerometer
          devices.
 
+config INTEL_CHT_INT33FE
+       tristate "Intel Cherry Trail ACPI INT33FE Driver"
+       depends on X86 && ACPI && I2C
+       ---help---
+         This driver add support for the INT33FE ACPI device found on
+         some Intel Cherry Trail devices.
+
+         The INT33FE ACPI device has a CRS table with I2cSerialBusV2
+         resources for 3 devices: Maxim MAX17047 Fuel Gauge Controller,
+         FUSB302 USB Type-C Controller and PI3USB30532 USB switch.
+         This driver instantiates i2c-clients for these, so that standard
+         i2c drivers for these chips can bind to the them.
+
 config INTEL_HID_EVENT
        tristate "INTEL HID Event"
        depends on ACPI
@@ -1087,7 +1101,7 @@ config INTEL_TURBO_MAX_3
 
 config SILEAD_DMI
        bool "Tablets with Silead touchscreens"
-       depends on ACPI && DMI && I2C=y && INPUT
+       depends on ACPI && DMI && I2C=y && TOUCHSCREEN_SILEAD
        ---help---
          Certain ACPI based tablets with Silead touchscreens do not have
          enough data in ACPI tables for the touchscreen driver to handle