Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4...

[mirror_ubuntu-artful-kernel.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 152b006833cda2518614f80b4cac15b518b0ef0b..cc4c6649d19503e236f905e8feafe21440237fea 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -92,7 +92,7 @@ menu "Special HID drivers"
        depends on HID
 
 config HID_A4TECH
-       tristate "A4 tech mice" if EXPERT
+       tristate "A4 tech mice"
        depends on HID
        default !EXPERT
        ---help---
@@ -113,7 +113,7 @@ config HID_ACRUX_FF
        game controllers.
 
 config HID_APPLE
-       tristate "Apple {i,Power,Mac}Books" if EXPERT
+       tristate "Apple {i,Power,Mac}Books"
        depends on HID
        default !EXPERT
        ---help---
@@ -141,7 +141,7 @@ config HID_AUREAL
        Support for Aureal Cy se W-01RN Remote Controller and other Aureal derived remotes.
 
 config HID_BELKIN
-       tristate "Belkin Flip KVM and Wireless keyboard" if EXPERT
+       tristate "Belkin Flip KVM and Wireless keyboard"
        depends on HID
        default !EXPERT
        ---help---
@@ -158,14 +158,14 @@ config HID_BETOP_FF
         - BETOP 2185 PC & BFM MODE
 
 config HID_CHERRY
-       tristate "Cherry Cymotion keyboard" if EXPERT
+       tristate "Cherry Cymotion keyboard"
        depends on HID
        default !EXPERT
        ---help---
        Support for Cherry Cymotion keyboard.
 
 config HID_CHICONY
-       tristate "Chicony Tactical pad" if EXPERT
+       tristate "Chicony Tactical pad"
        depends on HID
        default !EXPERT
        ---help---
@@ -196,7 +196,7 @@ config HID_CP2112
        customizable USB descriptor fields are exposed as sysfs attributes.
 
 config HID_CYPRESS
-       tristate "Cypress mouse and barcode readers" if EXPERT
+       tristate "Cypress mouse and barcode readers"
        depends on HID
        default !EXPERT
        ---help---
@@ -245,7 +245,7 @@ config HID_ELO
        different devices than those handled by CONFIG_TOUCHSCREEN_USB_ELO.
 
 config HID_EZKEY
-       tristate "Ezkey BTC 8193 keyboard" if EXPERT
+       tristate "Ezkey BTC 8193 keyboard"
        depends on HID
        default !EXPERT
        ---help---
@@ -286,12 +286,6 @@ config HID_GT683R
        Currently the following devices are know to be supported:
          - MSI GT683R
 
-config HID_HUION
-       tristate "Huion tablets"
-       depends on USB_HID
-       ---help---
-       Support for Huion 580 tablet.
-
 config HID_KEYTOUCH
        tristate "Keytouch HID devices"
        depends on HID
@@ -312,9 +306,9 @@ config HID_KYE
 
 config HID_UCLOGIC
        tristate "UC-Logic"
-       depends on HID
+       depends on USB_HID
        ---help---
-       Support for UC-Logic tablets.
+       Support for UC-Logic and Huion tablets.
 
 config HID_WALTOP
        tristate "Waltop"
@@ -344,7 +338,7 @@ config HID_TWINHAN
        Support for Twinhan IR remote control.
 
 config HID_KENSINGTON
-       tristate "Kensington Slimblade Trackball" if EXPERT
+       tristate "Kensington Slimblade Trackball"
        depends on HID
        default !EXPERT
        ---help---
@@ -372,7 +366,7 @@ config HID_LENOVO
        - ThinkPad Compact USB Keyboard with TrackPoint (supports Fn keys)
 
 config HID_LOGITECH
-       tristate "Logitech devices" if EXPERT
+       tristate "Logitech devices"
        depends on HID
        default !EXPERT
        ---help---
@@ -461,14 +455,14 @@ config HID_MAGICMOUSE
        Apple Wireless "Magic" Mouse and the Apple Wireless "Magic" Trackpad.
 
 config HID_MICROSOFT
-       tristate "Microsoft non-fully HID-compliant devices" if EXPERT
+       tristate "Microsoft non-fully HID-compliant devices"
        depends on HID
        default !EXPERT
        ---help---
        Support for Microsoft devices that are not fully compliant with HID standard.
 
 config HID_MONTEREY
-       tristate "Monterey Genius KB29E keyboard" if EXPERT
+       tristate "Monterey Genius KB29E keyboard"
        depends on HID
        default !EXPERT
        ---help---
@@ -638,10 +632,14 @@ config HID_PICOLCD_CIR
 
 config HID_PLANTRONICS
        tristate "Plantronics USB HID Driver"
-       default !EXPERT
        depends on HID
        ---help---
-       Provides HID support for Plantronics telephony devices.
+         Provides HID support for Plantronics USB audio devices.
+         Correctly maps vendor unique volume up/down HID usages to
+         KEY_VOLUMEUP and KEY_VOLUMEDOWN events and prevents core mapping
+         of other vendor unique HID usages to random mouse events.
+
+         Say M here if you may ever plug in a Plantronics USB audio device.
 
 config HID_PRIMAX
        tristate "Primax non-fully HID-compliant devices"
@@ -885,6 +883,21 @@ config HID_SENSOR_HUB
          for events and handle data streams. Each sensor driver can format
          data and present to user mode using input or IIO interface.
 
+config HID_SENSOR_CUSTOM_SENSOR
+       tristate "HID Sensors hub custom sensor support"
+       depends on HID_SENSOR_HUB
+       default n
+       ---help---
+         HID Sensor hub specification allows definition of some custom and
+         generic sensors. Unlike other HID sensors, they can't be exported
+         via Linux IIO because of custom fields. This is up to the manufacturer
+         to decide how to interpret these special sensor ids and process in
+         the user space. Currently some manufacturers are using these ids for
+         sensor calibration and debugging other sensors. Manufacturers
+         should't use these special custom sensor ids to export any of the
+         standard sensors.
+         Select this config option for custom/generic sensor support.
+
 endmenu
 
 endif # HID