Skip to content

Commit b838d36

Browse files
committed
Merge branch 'for-6.3/steam' into for-linus
Add Steam Deck support (Vicki Pfau)
2 parents 52bb059 + 9cd61c8 commit b838d36

File tree

3 files changed

+368
-28
lines changed

3 files changed

+368
-28
lines changed

drivers/hid/Kconfig

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,13 +1025,21 @@ config HID_SPEEDLINK
10251025
Support for Speedlink Vicious and Divine Cezanne mouse.
10261026

10271027
config HID_STEAM
1028-
tristate "Steam Controller support"
1028+
tristate "Steam Controller/Deck support"
10291029
select POWER_SUPPLY
10301030
help
1031-
Say Y here if you have a Steam Controller if you want to use it
1031+
Say Y here if you have a Steam Controller or Deck if you want to use it
10321032
without running the Steam Client. It supports both the wired and
10331033
the wireless adaptor.
10341034

1035+
config STEAM_FF
1036+
bool "Steam Deck force feedback support"
1037+
depends on HID_STEAM
1038+
select INPUT_FF_MEMLESS
1039+
help
1040+
Say Y here if you want to enable force feedback support for the Steam
1041+
Deck.
1042+
10351043
config HID_STEELSERIES
10361044
tristate "Steelseries SRW-S1 steering wheel support"
10371045
help

drivers/hid/hid-ids.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,6 +1189,7 @@
11891189
#define USB_VENDOR_ID_VALVE 0x28de
11901190
#define USB_DEVICE_ID_STEAM_CONTROLLER 0x1102
11911191
#define USB_DEVICE_ID_STEAM_CONTROLLER_WIRELESS 0x1142
1192+
#define USB_DEVICE_ID_STEAM_DECK 0x1205
11921193

11931194
#define USB_VENDOR_ID_STEELSERIES 0x1038
11941195
#define USB_DEVICE_ID_STEELSERIES_SRWS1 0x1410

0 commit comments

Comments
 (0)