Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[firefly-linux-kernel-4.4.55.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index f7220011a00b7cde8c16754743517ca17301366a..7af9d0b5dea16f427987e234952c44cd53c540fc 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -175,6 +175,15 @@ config HID_PRODIKEYS
          multimedia keyboard, but will lack support for the musical keyboard
          and some additional multimedia keys.
 
+config HID_CP2112
+       tristate "Silicon Labs CP2112 HID USB-to-SMBus Bridge support"
+       depends on USB_HID && I2C && GPIOLIB
+       ---help---
+       Support for Silicon Labs CP2112 HID USB to SMBus Master Bridge.
+       This is a HID device driver which registers as an i2c adapter
+       and gpiochip to expose these functions of the CP2112. The
+       customizable USB descriptor fields are exposed as sysfs attributes.
+
 config HID_CYPRESS
        tristate "Cypress mouse and barcode readers" if EXPERT
        depends on HID
@@ -608,25 +617,27 @@ config HID_SAMSUNG
        Support for Samsung InfraRed remote control or keyboards.
 
 config HID_SONY
-       tristate "Sony PS2/3 accessories"
+       tristate "Sony PS2/3/4 accessories"
        depends on USB_HID
        depends on NEW_LEDS
        depends on LEDS_CLASS
+       select POWER_SUPPLY
        ---help---
        Support for
 
          * Sony PS3 6-axis controllers
+         * Sony PS4 DualShock 4 controllers
          * Buzz controllers
          * Sony PS3 Blue-ray Disk Remote Control (Bluetooth)
          * Logitech Harmony adapter for Sony Playstation 3 (Bluetooth)
 
 config SONY_FF
-       bool "Sony PS2/3 accessories force feedback support"
+       bool "Sony PS2/3/4 accessories force feedback support" 
        depends on HID_SONY
        select INPUT_FF_MEMLESS
        ---help---
-       Say Y here if you have a Sony PS2/3 accessory and want to enable force
-       feedback support for it.
+       Say Y here if you have a Sony PS2/3/4 accessory and want to enable
+       force feedback support for it.
 
 config HID_SPEEDLINK
        tristate "Speedlink VAD Cezanne mouse support"