HID: magicmouse: Update device name for Apple Magic Trackpad
author你 言言 <soragoto@soragoto.io>
Mon, 2 Dec 2024 06:06:56 +0000 (06:06 +0000)
committerJiri Kosina <jkosina@suse.com>
Thu, 9 Jan 2025 08:56:25 +0000 (09:56 +0100)
Updated the device name for Apple Magic Trackpad USB-C when connected via
Bluetooth.

This change ensures the correct recognition of the 2024 USB-C trackpad and
improves user experience.

Signed-off-by: Qingyan Li <soragoto@soragoto.io>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
drivers/hid/hid-magicmouse.c

index ec110dea87726d9f89610f534f2d0739121c76bd..a76f171585399f5e330817dda85d330f6236339e 100644 (file)
@@ -52,6 +52,7 @@ module_param(report_undeciphered, bool, 0644);
 MODULE_PARM_DESC(report_undeciphered, "Report undeciphered multi-touch state field using a MSC_RAW event");
 
 #define TRACKPAD2_2021_BT_VERSION 0x110
+#define TRACKPAD_2024_BT_VERSION 0x314
 
 #define TRACKPAD_REPORT_ID 0x28
 #define TRACKPAD2_USB_REPORT_ID 0x02
@@ -567,9 +568,12 @@ static int magicmouse_setup_input(struct input_dev *input, struct hid_device *hd
                 */
                if (hdev->vendor == BT_VENDOR_ID_APPLE) {
                        if (input->id.version == TRACKPAD2_2021_BT_VERSION)
+                               input->name = "Apple Inc. Magic Trackpad 2021";
+                       else if (input->id.version == TRACKPAD_2024_BT_VERSION) {
+                               input->name = "Apple Inc. Magic Trackpad USB-C";
+                       } else {
                                input->name = "Apple Inc. Magic Trackpad";
-                       else
-                               input->name = "Apple Inc. Magic Trackpad 2";
+                       }
                } else { /* USB_VENDOR_ID_APPLE */
                        input->name = hdev->name;
                }