Skip to content

Commit be297c0

Browse files
Roderick Colenbranderonettboots
authored andcommitted
UPSTREAM: HID: playstation: add initial DualSense Edge controller support
Provide initial support for the DualSense Edge controller. The brings support up to the level of the original DualSense, but won't yet provide support for new features (e.g. reprogrammable buttons). Signed-off-by: Roderick Colenbrander <roderick.colenbrander@sony.com> CC: stable@vger.kernel.org Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Link: https://lore.kernel.org/r/20221010212313.78275-3-roderick.colenbrander@sony.com Bug: 260685629 (cherry picked from commit b8a968efab301743fd659b5649c5d7d3e30e63a6) Change-Id: I5b95de806e823085d1144f016d8cfd76e4a933ef Signed-off-by: Farid Chahla <farid.chahla@sony.com> Signed-off-by: onettboots <blackcocopet@gmail.com>
1 parent 67de273 commit be297c0

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

drivers/hid/hid-ids.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -987,6 +987,7 @@
987987
#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_2 0x09cc
988988
#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE 0x0ba0
989989
#define USB_DEVICE_ID_SONY_PS5_CONTROLLER 0x0ce6
990+
#define USB_DEVICE_ID_SONY_PS5_CONTROLLER_2 0x0df2
990991
#define USB_DEVICE_ID_SONY_MOTION_CONTROLLER 0x03d5
991992
#define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER 0x042f
992993
#define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER 0x0002

drivers/hid/hid-playstation.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1276,7 +1276,8 @@ static int ps_probe(struct hid_device *hdev, const struct hid_device_id *id)
12761276
goto err_stop;
12771277
}
12781278

1279-
if (hdev->product == USB_DEVICE_ID_SONY_PS5_CONTROLLER) {
1279+
if (hdev->product == USB_DEVICE_ID_SONY_PS5_CONTROLLER ||
1280+
hdev->product == USB_DEVICE_ID_SONY_PS5_CONTROLLER_2) {
12801281
dev = dualsense_create(hdev);
12811282
if (IS_ERR(dev)) {
12821283
hid_err(hdev, "Failed to create dualsense.\n");
@@ -1314,6 +1315,8 @@ static void ps_remove(struct hid_device *hdev)
13141315
static const struct hid_device_id ps_devices[] = {
13151316
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS5_CONTROLLER) },
13161317
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS5_CONTROLLER) },
1318+
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS5_CONTROLLER_2) },
1319+
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS5_CONTROLLER_2) },
13171320
{ }
13181321
};
13191322
MODULE_DEVICE_TABLE(hid, ps_devices);

0 commit comments

Comments
 (0)