diff options
| author | Siarhei Vishniakou <svv@google.com> | 2020-05-11 09:37:10 -0700 |
|---|---|---|
| committer | Siarhei Vishniakou <svv@google.com> | 2020-05-15 16:19:49 +0000 |
| commit | 7c5f3f37352a74c2605999f315ef9efe39a1288c (patch) | |
| tree | f81eb6b4de8e4ad8397ab63aa39264ef34b1da67 | |
| parent | 9bfa942fde10cb7ff5da7f4a3257641569391d56 (diff) | |
ANDROID: hid: steam: remove BT controller matching
The driver hid-steam is only meant to support the USB mode and the
wireless dongle mode. It was never meant to work over the BT using the
beta version of the firmware of the steam controller.
In the BT mode, the controller works as a "lizard-mode" device by
default. It probably needs to have a special command to activate the
controller mode, but for simplicity, we just revert to the upstream
state of having the hid-generic driver take care of it.
The lizard mode can probably be worked around in the BT stack.
Bug: 147434575
Test: connect Steam controller over BT (press steam button and "Y" key
simultaneously) and make sure that the mouse device shows up as a
cursor. You can use the trigger buttons to generate left and right mouse
clicks.
Test: compare against the upstream version, and check that it's missing
the define for STEAM_CONTROLLER_BT and the matching for the product ID
1106.
Signed-off-by: Siarhei Vishniakou <svv@google.com>
Change-Id: Id4f6c866a7e14e20c5e633889833f3708ec6b235
(cherry picked from commit 25849e1066e869f10a1bdfa43d5fb1b685b76480)
| -rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 92a375f26ab3..8f50210392de 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -2118,7 +2118,6 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60) }, { HID_USB_DEVICE(USB_VENDOR_ID_VALVE, USB_DEVICE_ID_STEAM_CONTROLLER) }, { HID_USB_DEVICE(USB_VENDOR_ID_VALVE, USB_DEVICE_ID_STEAM_CONTROLLER_WIRELESS) }, - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_VALVE, USB_DEVICE_ID_STEAM_CONTROLLER_BT) }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SUPER_JOY_BOX_3) }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 020a4bfa2629..47c3a8f9c4b1 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -906,7 +906,6 @@ #define USB_VENDOR_ID_VALVE 0x28de #define USB_DEVICE_ID_STEAM_CONTROLLER 0x1102 #define USB_DEVICE_ID_STEAM_CONTROLLER_WIRELESS 0x1142 -#define USB_DEVICE_ID_STEAM_CONTROLLER_BT 0x1106 #define USB_VENDOR_ID_STEELSERIES 0x1038 #define USB_DEVICE_ID_STEELSERIES_SRWS1 0x1410 |