Merge branch 'for-6.3/hid-bpf' into for-linus

[linux-block.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index b345bbfb57bf6f1d352b514f84d97b2771c202b7..82f64fb31fdab669bf81ccb415ed230d5734b13e 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -336,6 +336,13 @@ config HID_ELO
        Support for the ELO USB 4000/4500 touchscreens. Note that this is for
        different devices than those handled by CONFIG_TOUCHSCREEN_USB_ELO.
 
+config HID_EVISION
+       tristate "EVision Keyboards Support"
+       depends on HID
+       help
+       Support for some EVision keyboards. Note that this is needed only when
+       applying customization using userspace programs.
+
 config HID_EZKEY
        tristate "Ezkey BTC 8193 keyboard"
        default !EXPERT
@@ -904,7 +911,7 @@ config HID_PLAYSTATION
        select CRC32
        select POWER_SUPPLY
        help
-         Provides support for Sony PS5 controllers including support for
+         Provides support for Sony PS4/PS5 controllers including support for
          its special functionalities e.g. touchpad, lights and motion
          sensors.
 
@@ -1025,13 +1032,21 @@ config HID_SPEEDLINK
        Support for Speedlink Vicious and Divine Cezanne mouse.
 
 config HID_STEAM
-       tristate "Steam Controller support"
+       tristate "Steam Controller/Deck support"
        select POWER_SUPPLY
        help
-       Say Y here if you have a Steam Controller if you want to use it
+       Say Y here if you have a Steam Controller or Deck if you want to use it
        without running the Steam Client. It supports both the wired and
        the wireless adaptor.
 
+config STEAM_FF
+       bool "Steam Deck force feedback support"
+       depends on HID_STEAM
+       select INPUT_FF_MEMLESS
+       help
+       Say Y here if you want to enable force feedback support for the Steam
+       Deck.
+
 config HID_STEELSERIES
        tristate "Steelseries SRW-S1 steering wheel support"
        help
@@ -1259,7 +1274,8 @@ config HID_ALPS
 config HID_MCP2221
        tristate "Microchip MCP2221 HID USB-to-I2C/SMbus host support"
        depends on USB_HID && I2C
-       depends on GPIOLIB
+       imply GPIOLIB
+       imply IIO
        help
        Provides I2C and SMBUS host adapter functionality over USB-HID
        through MCP2221 device.
@@ -1270,6 +1286,7 @@ config HID_MCP2221
 config HID_KUNIT_TEST
        tristate "KUnit tests for HID" if !KUNIT_ALL_TESTS
        depends on KUNIT=y
+       depends on HID_BATTERY_STRENGTH
        depends on HID_UCLOGIC
        default KUNIT_ALL_TESTS
        help