From patchwork Mon Dec 2 06:06:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5L2gIOiogOiogA==?= X-Patchwork-Id: 13890038 X-Patchwork-Delegate: jikos@jikos.cz Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11olkn2039.outbound.protection.outlook.com [40.92.20.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9641C1D5CF9; Mon, 2 Dec 2024 06:06:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.92.20.39 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733119620; cv=fail; b=Ut2XsppDUMnuSKlspDIUk4twEXN0WLM72kXL84yfiClwy7NHqIcGnHKwiLjtbczBgFk1AWlng/Up04EQIyre+569Y0m6bO+L2hlKeiqqkEQtbSko21IjwdadzM9rODuKsAyI7vEDAgaaX/Ufn/KJEVj9WoJxQ4hPIHVwqqYaAFU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733119620; c=relaxed/simple; bh=7J0PDYvc1Yfn1UqAvdgZKtBa30jFyF8x+q5ck6zWO8g=; h=From:To:CC:Subject:Date:Message-ID:Content-Type:MIME-Version; b=QjHd60lEvL/clX83Qj609ZD98sxVcSL9gQtmy4sxXe9fHHl56X9pq/1eQo57g17RRYLwOD/FIH+AyDUXA6SjgFH2aPrT6xRFct6DHExevZ8tm/owXMyYgO+sWv2F6Syr6oA6BhlBVmh93kZ+nAznGWFJVDOQxmhaBC0l/ATQaWA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=soragoto.io; spf=pass smtp.mailfrom=soragoto.io; arc=fail smtp.client-ip=40.92.20.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=soragoto.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soragoto.io ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=R8hc/atiU1ViLeVewCBW+yq531YCM7xar2CHcxymOBlVFx0OR+QGk6TZYZP/qeClTDysWhUKIuPHEqPK+lxycirEko0/yoeRKhEjDJLhbRN8m91rkIk69hG2QpBtGtJo++eJv0FmlF6ycPnMzx16nc/c43wpXCZ4g/Zjn9xDWNTD6agTitL9F20oXJq2TQXICAEziYNFcN/FxZPZ4aTtBFBD7KAjlv7ftBu1lFKGAIdxwdJFka1WCrSg7WwQPBWMBnAAhFMgooLoBTLn0ZTlg6NIeXYTbB9sDqE7wFESXd7HdJGRQUx1f6WOf/Vc3QWajIk53vsfRD5h9PIIqAuKXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7J0PDYvc1Yfn1UqAvdgZKtBa30jFyF8x+q5ck6zWO8g=; b=JZjFaTUYS98NwNd6/ZTHnfi259ryTO0XINluY2SklqUPxPF1W+wV6oTTOA/Ac8vH7Re9A2xBtCTAL9oDqYaSjk/GWVbHLAUdLb/UD4Qd/Ni/Izef5C140m0zZZPtD6804NWbqkDUwwmscfkG+sYP1btpcyT70e4W9b2b9Nq/l/VMehSp3q1YUiUyDNIPNpmOShYg6u20cb/KRzyQJq9dueXavWNbovHmyreQAPGorhycZGazAIF+3Fgp71U53lYtriqix3EQMpFcMGhkQpcyX2bGe94Nw2Ev64NGRzGF/BISwzPp4Bb5HbmRX2OmEi9Z49V0fCgv+eCvREYPQXjwPQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from BN8PR14MB3441.namprd14.prod.outlook.com (2603:10b6:408:7c::23) by CH2PR14MB3723.namprd14.prod.outlook.com (2603:10b6:610:62::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8182.18; Mon, 2 Dec 2024 06:06:56 +0000 Received: from BN8PR14MB3441.namprd14.prod.outlook.com ([fe80::1538:64af:c2aa:e23d]) by BN8PR14MB3441.namprd14.prod.outlook.com ([fe80::1538:64af:c2aa:e23d%6]) with mapi id 15.20.8207.017; Mon, 2 Dec 2024 06:06:56 +0000 From: =?big5_tw?b?p0EgqKWopQ==?= To: Jiri Kosina , Benjamin Tissoires CC: =?big5_tw?b?p0EgqKWopQ==?= , "linux-input@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH] HID: magicmouse: Update device name for Apple Magic Trackpad Thread-Topic: [PATCH] HID: magicmouse: Update device name for Apple Magic Trackpad Thread-Index: AQHbRIBkLUc6MOTpSUC7jabUFegOeQ== Date: Mon, 2 Dec 2024 06:06:56 +0000 Message-ID: <20241202060545.21193-1-soragoto@soragoto.io> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BN8PR14MB3441:EE_|CH2PR14MB3723:EE_ x-ms-office365-filtering-correlation-id: 5b43a6ea-e80b-469b-b877-08dd12978685 x-microsoft-antispam: BCL:0;ARA:14566002|38102599003|15080799006|19110799003|8062599003|8060799006|461199028|102099032|440099028|3412199025|1710799026; x-microsoft-antispam-message-info: =?big5_tw?b?d2lYcCtyQk5YTXBDc05IUjluNTZ5bTIr?= =?big5_tw?b?LzBnaFNZV3cyeER2VjBLejRwVFhGNlUrSnZxVmFuZmNoUi9DUWtMcm90eXU0dXVx?= =?big5_tw?b?RTFoZmFLZ3B4T0VhYk9RRmtuTHFRbEtiZFNpVThjT2tSZDdOM0l4VnFzN1BxTFRH?= =?big5_tw?b?TDJnNFU2bEQwaUlWQUFkbE02TUU5QThiYWZLNHl4YXA4ZlFWbytnci9tNktaUlpi?= =?big5_tw?b?MXByMGY3Q3ErTXhrYld0eDVnV2ZGUGtzMmFnTjJVTnlBKzdwUGw5V0ZSTHFCVWZR?= =?big5_tw?b?bExXU0lvWEpYRjJwdjB3QlNPZUhnMzBUNUtNK3FLT2hjMnNRdEtRS0NuakcrQ2pR?= =?big5_tw?b?WnZ1R2o4b3ZzOFhKM20vR2VsTUZnclQzdnRneXZQQjQ5N2dKSVlRK0Z5aE1KZ2xF?= =?big5_tw?b?Zi81cmZDcnR0QythWlAvVEludkphVzdjTFBDcTEvZmVtMFZsMnNLV0tTRjU2YUNo?= =?big5_tw?b?VVA1azYyVmVLekJEcFpHaS84Y1J0Tm9KVVM0M0RtMTk2ZXZBVTVta1U3cFBvUW0w?= =?big5_tw?b?WUpoS0U5N0VTTXFRNEsxUk4wVE5YTkJuYlhsa3hpV2Q2YkdSRTU0OWJyNUM2NFN4?= =?big5_tw?b?SzViL2o1eFN5ZTR2ZTBMM1hleGc1V3B4eEwvMi84VWhoYlZ3QnRjeU52bml6cDQx?= =?big5_tw?b?UEpyeDdPQ21OdmZLUFhJeEcvc3lFZGcwWVFCUnh2czF3ZHpBc2dKOUF1Q3B6SUxU?= =?big5_tw?b?TmxYY1VNWW4ybWl6ZHZZS0V2b1dJbG93VGRBeDU1aFFHaGlGOE9EazJNTmVPM0Mr?= =?big5_tw?b?a0ZKdGVvMy93dktEb3hlcE9UaEdvYjJXVHg5K3MrNUpwbVpHamY4cTFJZnN0TG9o?= =?big5_tw?b?UmlyWkQ1YTlCR1JaRzA5dEFyVXlWZFBHd2tDcjJKY2tRb3ZRM2Q1SlRGby95REU0?= =?big5_tw?b?OVN4aFdodjI4S21BYVF6VjNCNzMwYTBZTUcwaFl2Vjh5MFo0OHRQYWdHdUVRRUxQ?= =?big5_tw?b?cDVmZDQwRGJ5czZSNlhZa01oOTVpY1Zoem96YnhoamR5T0ZLY0V2ZjBXWVc3Nk5y?= =?big5_tw?b?WUVZZEJVaU1VcW5KVXF0RytkVFF3MXdMQUtTeXh1WWE0QUdPTUZ3bngxUGFOenlV?= =?big5_tw?b?ZUo2dm8vc0FZWEZDK3gvYkp5SEgySTg0cncwQjVqekEzNGFxeitkMjZrb2FrdHl2?= =?big5_tw?b?WW56Vm0vc0dneUdnaTNnQnYrdGkvdWs5K2p3Wk5FdFA2UldkZ0ZFTitoS0Z1L1ow?= =?big5_tw?b?cENRSHlDb25MdWgxUkpTMzNQK1NYVzY0ZjhKNFlkbmJVcWRhMkVnMHRuRHJ1c2t0?= =?big5_tw?b?QU1WMnVQNmRJU2RXN2g1Y2NMeFVqRlFIbTlnb3gvYU9rWktwL3RwSERoODU4YUps?= =?big5_tw?b?a0xoS2ExUVRNWlEzc3JKYXYxc282V29yOFd6Q0d6ajhxa1VQMU1DaFF4Uk5ndjFH?= =?big5_tw?b?NTVTSEhwQ3E=?= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?big5_tw?b?WkExTDF4bENEeE1PckU5ZU9mWFI2?= =?big5_tw?b?cjZSK1Bhazd4TGxBYzBabk8vemVoWENiK3UzbGs0ejVYSUxZcFhWcWVtZ21XTkRm?= =?big5_tw?b?MUY2RzI2QXo3M2NlTnkvbTVXUWpCcWo1M000QzBCbWF1RExOK09ZTlJMUGsrWVdM?= =?big5_tw?b?Wnl4VmlHeEZDd2w5encrSmtWc1BXbkdqUkxiNWlvNkpDeTlrK0laR0U5dGZlQ3Ir?= =?big5_tw?b?NGJZMjdLNDl3UlVKY1RrYWFGM3Iyd1M0SmdEaWlFeXdVSDVmUE9McWpUOXN1dUlT?= =?big5_tw?b?ME1zSy9pclJzQklYZ2llVWhQM2c5SkE2eWFFcDVhdGxwWkZ5aHZick1GNjVSdVhN?= =?big5_tw?b?M2Q0blJtZ3d3alkrOGJ2N0U2cDAyN2Zpc1hRU3BFNjBaUS9YVWxWUE1HWWdRbHdK?= =?big5_tw?b?SkJMc3pGZFRIRVlYcEs4bTFLcUZESWM5TUFJa0ovUG9WS1gvK0xpQmE3ak9kSVRS?= =?big5_tw?b?K2N3Z2Nkb0hwSEpBN1NKQ3A3azRYakExWDhhcWs4d3JOL2tGNWVqcVl5MWx3dEpN?= =?big5_tw?b?c3dCT2oybm1IT1h0eHJLZzYzWkZUWU1kK3Y2alc5cnY4UUJXZEU1ekZHZVhmOGd4?= =?big5_tw?b?L01BVG4zckNrUm4vY0RRcVg2ZlhFUFB1NlF3RU83QVpPcHlvL2VTb1haUWUwOXFN?= =?big5_tw?b?RHFieURObVdwKzVzVmVJRk9MMFE2TXF4Zm1aa3d4a2VxUTdEaDA5eU1Fck5OOGE0?= =?big5_tw?b?Q21renRrNlVDUlcwRkthR0p0MGVJdkhkczlGMmhRK1lMK3JYTG5rQnVyclQwMFN4?= =?big5_tw?b?YTNEUDJhU3A0SWdzMHhXZWhVQ1o5VGlJZWY1WnQzKy9SdUd1aUtHZE9iVFM0QmJx?= =?big5_tw?b?Z3ZKZDJ6UDh5aHZ0MDhPS2gwR0M0QVVnMEZudWRSMjg0dVM2enM4Q1FvTXBIQlVo?= =?big5_tw?b?VGdIWWJPVlozWlQ2YmRtWmZ2Y0ZmVHpSaGx5QTdQSERsZW1RdFN0dXA1QnB4b0x3?= =?big5_tw?b?OFRxL0V1SlI0V2tPSzlsdDBvZkF6M3k4RWtxaFowbEtFNEx2RnI5VFRUNHZHU3lm?= =?big5_tw?b?YS94OWRkcG11SzlqYW83RXQwelV5R0M5UnFNVFRPZ2Rsc2w2WUN5Z2p6cEo0WTNT?= =?big5_tw?b?UjhLZmxkU1kvTDVmUnNXRTZwUmRsWnR1RGFlQTAvYkQ5RnppbXNiWEpKSkxjZ2hL?= =?big5_tw?b?QTd0UmcvbXdhUW44Q3RHQUk3WVgrcngwV28zUE04V0JNbWx2Uy84RDZYYXEwbTlj?= =?big5_tw?b?WlhuVzZ6b05laWp2elQ5VE1tM3Nna1BQUnh0UWp3eFZOT3h3MmJoNDJlbzlrM1lO?= =?big5_tw?b?MXJUbnJhaXlJSm9kQ1laNUpWaHFFN1VWejNtVVdEWFhkYk53MGNKODNFZTFRdUJR?= =?big5_tw?b?SXJldjRlS3p1ZlY0SlVPb21oNG92WXAzU0xhTkVUaFpYQ1Q1ZmVkT0c1K0ltWHlY?= =?big5_tw?b?dURZSHZoREY4SU94SnBmSFFhdy9SZ05URHptMWMzS2p2aXVNbmdUeHRKTDhOcGFT?= =?big5_tw?b?Wjc4djJBMVQyZmRDcWllbUlmRFR4aWdteFpUeUZkbVNrWVY0di96TUNYcnhZWnRR?= =?big5_tw?b?OS9qYThYdWY5NS8wK0VqVSswRzNPNlYxdkhJYTBTV3JhYXA0bTBPeXdHdmNOdWwv?= =?big5_tw?b?QW0wQ2tuMHh6YTVvKzh4a1E9PQ==?= Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-7719-19-msonline-outlook-e4812.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN8PR14MB3441.namprd14.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 5b43a6ea-e80b-469b-b877-08dd12978685 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Dec 2024 06:06:56.2657 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR14MB3723 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 --- drivers/hid/hid-magicmouse.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index ec110dea8772..a76f17158539 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c @@ -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; }