mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-22 02:17:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-7.2/playstation' into for-linus

Browse Source
This commit is contained in:
Jiri Kosina
2026-06-16 21:50:20 +02:00
parent b81d1b68a9 bf29bafe3e
commit cd4f494ba5
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/hid/hid-playstation.c
View File

@@ -112,6 +112,12 @@ struct ps_led_info {
#define DS_BUTTONS2_TOUCHPAD BIT(1)
#define DS_BUTTONS2_MIC_MUTE BIT(2)
/* DualSense Edge extra buttons in buttons[2], bits 4-7. */
#define DS_EDGE_BUTTONS_FN1 BIT(4)
#define DS_EDGE_BUTTONS_FN2 BIT(5)
#define DS_EDGE_BUTTONS_LEFT_PADDLE BIT(6)
#define DS_EDGE_BUTTONS_RIGHT_PADDLE BIT(7)
/* Status fields of DualSense input report. */
#define DS_STATUS0_BATTERY_CAPACITY GENMASK(3, 0)
#define DS_STATUS0_CHARGING GENMASK(7, 4)
@@ -178,6 +184,9 @@ struct dualsense {
struct input_dev *touchpad;
struct input_dev *jack;
/* True if this is a DualSense Edge (product 0x0df2). */
bool is_edge;
/* Update version is used as a feature/capability version. */
u16 update_version;
@@ -1486,6 +1495,18 @@ static int dualsense_parse_report(struct ps_device *ps_dev, struct hid_report *r
input_report_key(ds->gamepad, BTN_THUMBL, ds_report->buttons[1] & DS_BUTTONS1_L3);
input_report_key(ds->gamepad, BTN_THUMBR, ds_report->buttons[1] & DS_BUTTONS1_R3);
input_report_key(ds->gamepad, BTN_MODE, ds_report->buttons[2] & DS_BUTTONS2_PS_HOME);
if (ds->is_edge) {
input_report_key(ds->gamepad, BTN_TRIGGER_HAPPY1,
ds_report->buttons[2] & DS_EDGE_BUTTONS_FN1);
input_report_key(ds->gamepad, BTN_TRIGGER_HAPPY2,
ds_report->buttons[2] & DS_EDGE_BUTTONS_FN2);
input_report_key(ds->gamepad, BTN_TRIGGER_HAPPY3,
ds_report->buttons[2] & DS_EDGE_BUTTONS_LEFT_PADDLE);
input_report_key(ds->gamepad, BTN_TRIGGER_HAPPY4,
ds_report->buttons[2] & DS_EDGE_BUTTONS_RIGHT_PADDLE);
}
input_sync(ds->gamepad);
/*
@@ -1785,6 +1806,7 @@ static struct ps_device *dualsense_create(struct hid_device *hdev)
ds->use_vibration_v2 = ds->update_version >= DS_FEATURE_VERSION(2, 21);
} else if (hdev->product == USB_DEVICE_ID_SONY_PS5_CONTROLLER_2) {
ds->use_vibration_v2 = true;
ds->is_edge = true;
}
ret = ps_devices_list_add(ps_dev);
@@ -1802,6 +1824,15 @@ static struct ps_device *dualsense_create(struct hid_device *hdev)
ret = PTR_ERR(ds->gamepad);
goto err;
}
/* Register DualSense Edge back paddle and Fn buttons. */
if (ds->is_edge) {
input_set_capability(ds->gamepad, EV_KEY, BTN_TRIGGER_HAPPY1);
input_set_capability(ds->gamepad, EV_KEY, BTN_TRIGGER_HAPPY2);
input_set_capability(ds->gamepad, EV_KEY, BTN_TRIGGER_HAPPY3);
input_set_capability(ds->gamepad, EV_KEY, BTN_TRIGGER_HAPPY4);
}
/* Use gamepad input device name as primary device name for e.g. LEDs */
ps_dev->input_dev_name = dev_name(&ds->gamepad->dev);