Skip to content

Commit

Permalink
HID: magicmouse: set Magic Trackpad 2021 name
Browse files Browse the repository at this point in the history
The Apple Magic Trackpad 2021 (3rd generation) has the same product ID
as the 2nd generation. However, when connected through Bluetooth, the
version has changed from 0x107 to 0x110.

The other meaningful change is that the name has dropped the generation
number and now it is just "Apple Inc. Magic Trackpad", like the first
generation model.

Set the device name correctly to ensure the same driver settings are
loaded, whether connected via Bluetooth or USB.

Signed-off-by: José Expósito <jose.exposito89@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
José Expósito authored and Jiri Kosina committed Jan 6, 2022
1 parent 0aa45fc commit 5768701
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions drivers/hid/hid-magicmouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ static bool report_undeciphered;
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_REPORT_ID 0x28
#define TRACKPAD2_USB_REPORT_ID 0x02
#define TRACKPAD2_BT_REPORT_ID 0x31
Expand Down Expand Up @@ -543,10 +545,14 @@ static int magicmouse_setup_input(struct input_dev *input, struct hid_device *hd
* Set the device name to ensure the same driver settings get
* loaded, whether connected through bluetooth or USB.
*/
if (hdev->vendor == BT_VENDOR_ID_APPLE)
input->name = "Apple Inc. Magic Trackpad 2";
else /* USB_VENDOR_ID_APPLE */
if (hdev->vendor == BT_VENDOR_ID_APPLE) {
if (input->id.version == TRACKPAD2_2021_BT_VERSION)
input->name = "Apple Inc. Magic Trackpad";
else
input->name = "Apple Inc. Magic Trackpad 2";
} else { /* USB_VENDOR_ID_APPLE */
input->name = hdev->name;
}

__clear_bit(EV_MSC, input->evbit);
__clear_bit(BTN_0, input->keybit);
Expand Down

0 comments on commit 5768701

Please sign in to comment.