These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / input / misc / Kconfig

diff --git a/kernel/drivers/input/misc/Kconfig b/kernel/drivers/input/misc/Kconfig
index 4436ab1..d6d16fa 100644 (file)
--- a/kernel/drivers/input/misc/Kconfig
+++ b/kernel/drivers/input/misc/Kconfig
@@ -94,11 +94,11 @@ config INPUT_BMA150
          module will be called bma150.
 
 config INPUT_E3X0_BUTTON
-       tristate "NI Ettus Research USRP E3x0 Button support."
+       tristate "NI Ettus Research USRP E3xx Button support."
        default n
        help
          Say Y here to enable support for the NI Ettus Research
-         USRP E3x0 Button.
+         USRP E3xx Button.
 
          To compile this driver as a module, choose M here: the
          module will be called e3x0_button.
@@ -167,28 +167,16 @@ config INPUT_M68K_BEEP
        depends on M68K
 
 config INPUT_MAX77693_HAPTIC
-       tristate "MAXIM MAX77693 haptic controller support"
-       depends on MFD_MAX77693 && PWM
+       tristate "MAXIM MAX77693/MAX77843 haptic controller support"
+       depends on (MFD_MAX77693 || MFD_MAX77843) && PWM
        select INPUT_FF_MEMLESS
        help
          This option enables support for the haptic controller on
-         MAXIM MAX77693 chip.
+         MAXIM MAX77693 and MAX77843 chips.
 
          To compile this driver as module, choose M here: the
          module will be called max77693-haptic.
 
-config INPUT_MAX77843_HAPTIC
-    tristate "MAXIM MAX77843 haptic controller support"
-    depends on MFD_MAX77843 && REGULATOR
-    select INPUT_FF_MEMLESS
-    help
-      This option enables support for the haptic controller on
-      MAXIM MAX77843 chip. The driver supports ff-memless interface
-      from input framework.
-
-      To compile this driver as module, choose M here: the
-      module will be called max77843-haptic.
-
 config INPUT_MAX8925_ONKEY
        tristate "MAX8925 ONKEY support"
        depends on MFD_MAX8925
@@ -259,7 +247,7 @@ config INPUT_APANEL
 config INPUT_GP2A
        tristate "Sharp GP2AP002A00F I2C Proximity/Opto sensor driver"
        depends on I2C
-       depends on GPIOLIB
+       depends on GPIOLIB || COMPILE_TEST
        help
          Say Y here if you have a Sharp GP2AP002A00F proximity/als combo-chip
          hooked to an I2C bus.
@@ -269,7 +257,7 @@ config INPUT_GP2A
 
 config INPUT_GPIO_BEEPER
        tristate "Generic GPIO Beeper support"
-       depends on GPIOLIB
+       depends on GPIOLIB || COMPILE_TEST
        help
          Say Y here if you have a beeper connected to a GPIO pin.
 
@@ -278,7 +266,7 @@ config INPUT_GPIO_BEEPER
 
 config INPUT_GPIO_TILT_POLLED
        tristate "Polled GPIO tilt switch"
-       depends on GPIOLIB
+       depends on GPIOLIB || COMPILE_TEST
        select INPUT_POLLDEV
        help
          This driver implements support for tilt switches connected
@@ -569,7 +557,7 @@ config INPUT_PWM_BEEPER
 
 config INPUT_GPIO_ROTARY_ENCODER
        tristate "Rotary encoders connected to GPIO pins"
-       depends on GPIOLIB
+       depends on GPIOLIB || COMPILE_TEST
        help
          Say Y here to add support for rotary encoders connected to GPIO lines.
          Check file:Documentation/input/rotary-encoder.txt for more
@@ -610,6 +598,16 @@ config INPUT_DA9055_ONKEY
          To compile this driver as a module, choose M here: the module
          will be called da9055_onkey.
 
+config INPUT_DA9063_ONKEY
+       tristate "Dialog DA9062/63 OnKey"
+       depends on MFD_DA9063 || MFD_DA9062
+       help
+         Support the ONKEY of Dialog DA9063 and DA9062 Power Management ICs
+         as an input device capable of reporting the power button status.
+
+         To compile this driver as a module, choose M here: the module
+         will be called da9063_onkey.
+
 config INPUT_DM355EVM
        tristate "TI DaVinci DM355 EVM Keypad and IR Remote"
        depends on MFD_DM355EVM_MSP
@@ -766,7 +764,8 @@ config INPUT_SOC_BUTTON_ARRAY
 
 config INPUT_DRV260X_HAPTICS
        tristate "TI DRV260X haptics support"
-       depends on INPUT && I2C && GPIOLIB
+       depends on INPUT && I2C
+       depends on GPIOLIB || COMPILE_TEST
        select INPUT_FF_MEMLESS
        select REGMAP_I2C
        help
@@ -775,6 +774,17 @@ config INPUT_DRV260X_HAPTICS
          To compile this driver as a module, choose M here: the
          module will be called drv260x-haptics.
 
+config INPUT_DRV2665_HAPTICS
+       tristate "TI DRV2665 haptics support"
+       depends on INPUT && I2C
+       select INPUT_FF_MEMLESS
+       select REGMAP_I2C
+       help
+         Say Y to enable support for the TI DRV2665 haptics driver.
+
+         To compile this driver as a module, choose M here: the
+         module will be called drv2665-haptics.
+
 config INPUT_DRV2667_HAPTICS
        tristate "TI DRV2667 haptics support"
        depends on INPUT && I2C
@@ -784,6 +794,6 @@ config INPUT_DRV2667_HAPTICS
          Say Y to enable support for the TI DRV2667 haptics driver.
 
          To compile this driver as a module, choose M here: the
-         module will be called drv260x-haptics.
+         module will be called drv2667-haptics.
 
 endif