From patchwork Sat Mar 29 09:36:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 14032642 X-Patchwork-Delegate: jikos@jikos.cz Received: from PNYPR01CU001.outbound.protection.outlook.com (mail-centralindiaazolkn19010014.outbound.protection.outlook.com [52.103.68.14]) (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 9A35219004A; Sat, 29 Mar 2025 09:37:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.103.68.14 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743241022; cv=fail; b=IPn9MrlX+lGzupAFbVOFVvdnkuFfRLq6dfXLN0REeHjQ0Ihzq9i5K4oOp6zjOLdpgDdhxtLFiGbXdtwrF3zSMjzO7SJfIfIZshDoWy4cJ4btxfOyQnR2nG16EihNAE1QOvgopAV34qnNj20AaSO5lNgFwIOIVm0Z3ab/MszXy4g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743241022; c=relaxed/simple; bh=y0jHra9XgMcl2ILOdu5UwGrt0Bl8EFarotMqjhbIiUk=; h=Message-ID:Date:Subject:From:To:Cc:References:In-Reply-To: Content-Type:MIME-Version; b=nLGnoaO03OFOcZpryTv24P5dKB4LAbBGQdzGw7fOGAl9BI86j8HmvaFoZQBv84cK8hzs1GtmLFMGmm8kRJ8mxoO5bfUC2Z29pzIjvnyFu33MR8kQNLdpoHjszEbNJ96qXQX8+GO7LTX9wwpZ9fu31S8+03/G3TNjTPjHRAqkPmY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=live.com; spf=pass smtp.mailfrom=live.com; dkim=pass (2048-bit key) header.d=live.com header.i=@live.com header.b=RtE2/cHQ; arc=fail smtp.client-ip=52.103.68.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=live.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=live.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=live.com header.i=@live.com header.b="RtE2/cHQ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=clBM8j0P6F+0MHztjQYzOCOSQWkMcvM8SghF9qEUrEENjeS0iNtuRb/6tmbHmgQ5PomOR19RFe7hA+H/9NFNnvf7YHJ9KmuuUGRljmyKaotiHEFnTUPwWgsWBbHIo36r0UGsWXEUxIy/IOlJH4s7Zw4RTZbNAFPNeI1SfZegkZ1OuiZjAqS/YG6XXp/BA18GX0WAaRtKtYDYexJa1/V6k6YHniIMK9YSTOlYsHA2R9hxzbQenU240dS/uQGg+I9UTOi/16D3thCeUnZkdyrU04L5q4qdsKYAek1XOx8Aa9lgyulnlPvg4VZrMr4s2bLEo5H9rHi6yY16UnK9oA/Ycw== 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=z9E3evAXFtqh3K8HqsNk/YDfqH3XprhMB7zuawZtJAM=; b=mug0G+tQkRsglxuim6jRqpwIDqvc8iVV0Xk/+zvNmV33v8VNO4okbJCkwmwQLX/HqFsSDPtqUZD6sJ6u8AX2SLO0sWYzsUfpBIjVO7gC1J5xehJa035AUxwWm5EQ/AeSHNsaE4AeJX1nswYwtVzBPIifcjnduw5wHIyc1KvghFzIY8K+v26+GoBD5u/H5hu47XtFU9CmLd8C3wBD/ZtMlPc3oHppI8c/Z/OOHCjJnuVpa5P7oYGqHrAJ9VpCdl14CHVXrowvEyXwFeSncoti0aK2WSMjT4Aq/xRs4GIs9JCiKM9/ehR0U+qS3kLno0kESbIu+o/nAzleDsvY9NGxSg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=z9E3evAXFtqh3K8HqsNk/YDfqH3XprhMB7zuawZtJAM=; b=RtE2/cHQ7PYKDjxRgjQBaNRmyM+ZnUsihEVGdw5oLwcjB/rQRiTsJrAY3jPOR+X+6vtnPmxgZuPXzUKIJHXRLkRMsWLYMINTg6HNpM9hzyC3I+xpqPLr+kYnB3MmQvwP83JNQ1tYI6lMXKcaIsoSYRYmg2F0gJX5JTV9D529AN4ln1tTzfreVGtU/mkxUBGW04AsqCCUxAeFim06eT7GueMEpM/hLi3xihjeKrrNcyXK/XOLJH9d0K3ESkSJ7HZ5fuO/e6FHs6jtRbPd+lbgNzykBjHt4xz2B1dlwTkKobrB+GeIa1LCiH4MvZdkTbmbBKQbdzXUer/0q9QPhJ6lFQ== Received: from PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:f7::14) by PN0PR01MB10042.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:1e9::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8583.27; Sat, 29 Mar 2025 09:36:56 +0000 Received: from PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM ([fe80::324:c085:10c8:4e77]) by PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM ([fe80::324:c085:10c8:4e77%7]) with mapi id 15.20.8583.028; Sat, 29 Mar 2025 09:36:56 +0000 Message-ID: Date: Sat, 29 Mar 2025 15:06:53 +0530 User-Agent: Mozilla Thunderbird Subject: [PATCH v5 5/5] HID: apple: Add Apple Magic Keyboard A3119 USB-C support From: Aditya Garg To: jikos@kernel.org, jkosina@suse.com, bentiss@kernel.org, benjamin.tissoires@redhat.com Cc: g.sokol99@g-sokol.info, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org References: Content-Language: en-US In-Reply-To: X-ClientProxiedBy: PN2PR01CA0053.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:22::28) To PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:f7::14) X-Microsoft-Original-Message-ID: Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PN3PR01MB9597:EE_|PN0PR01MB10042:EE_ X-MS-Office365-Filtering-Correlation-Id: 4d927c83-1a2b-4c32-8610-08dd6ea53ef6 X-Microsoft-Antispam: BCL:0;ARA:14566002|19110799003|8060799006|15080799006|7092599003|461199028|6090799003|5072599009|3412199025|440099028; X-Microsoft-Antispam-Message-Info: =?utf-8?q?kiWui5bz4rXAcnT7gM9mapgSaXrdvNA?= =?utf-8?q?AYD9I4sj0Y9N7QNTa11OcOeKpoDW3pIhy/4gkNUeghQt9fAAWc0csSxq+k0rsPWi0?= =?utf-8?q?wugTxgIM5wWOBa8re93ffr2bYRHwpv8Rr0yhAH7vRWw2+loqC/yF/7XpBz1V6qg0L?= =?utf-8?q?nFPJVFQdfPAR9KHBIyC6i4H/q/fqzHFUV/DrvrR3D9STS+c6LPijAqjxcUkLYd7r0?= =?utf-8?q?gxwzoyhQzKxKZ9Oqwu50Ye4jQo+xbHoDNIMyQ50l1uhT1D5lLXIcEko55CKFbK6Ql?= =?utf-8?q?K4FdRs9ItJqRno4brvo1NaWC2jskd4VFRw9epSGpN3lpaH3eN4LDuQ2qnMlobZMBR?= =?utf-8?q?zXeFxOgg/O6++PJbUWqOkNvbLVnVcwYyT3iNcN2n73Aw8zdcJIE14h63a2yjQ6HlO?= =?utf-8?q?r4UlRA+mr1vdyxbp6wYnme6Xa1w6rs3TvJOrxTZVxT4yIlZoQ4XIE5kw4QRnV8wiQ?= =?utf-8?q?IZ64M8lNeRSwyaJbb0Dth0urRLDNNozLcn8l+UKpEGLqJgkz552C/fqRZQjqmknKV?= =?utf-8?q?n/Rg96xUCC0B6T0O5ngEbEfi/GrP/VTBbLm3T81rhC80p+Bvnd4AgdScJtxuqPxCZ?= =?utf-8?q?xEoO7RVCFGmtmYrtSgVMvqcgOo+hUr6ejKfyxwxmddgDxIhHGeGmrYSzu8GRJbkK3?= =?utf-8?q?EIpfqUwvRo5DtZTj8ZuQSA1ygKZdWSQF4HZsW2Ayma2AXXGDQJ5qOBq7zgtMM7wUo?= =?utf-8?q?nIcxolr0bCIyHZPZ1c2QPxTjLhwSjvkWTsPA6BsT6qC4KPLnLFgXvWzjnzYhkPAvG?= =?utf-8?q?JGmhPYi0EtkhowUNByPJqITGSJblFgwpwegSWmsG1RgWCNDV9lc/UJJEC1TY46Kc/?= =?utf-8?q?f4xr1y9fvp1x84B8piISiaqwVabJe99KmypF2sjcBH+IqMKtCSSqJaVA1TBBEFLuh?= =?utf-8?q?rYG+0r4iPl8lwANvr0kfnMlNeyBDjIPG7lMS0DGdWf5OPjx9GwfiQGGsUFemxL9o5?= =?utf-8?q?0Nzx63SFfM8dE+MW3GqnE1Xmbve2/kZ7grSYw45R35tNY1OBqaKq8NzH678JPAlZf?= =?utf-8?q?zC2iSydybYrRUxYxLY8cExiwEPYhbltA3m/Q22OAt2x0/6eH5Qj1wjnooyNY+j+If?= =?utf-8?q?gi9wwuYTPmg3wH9XP2SnnlfkOjCaUJAhu/kkMQ=3D=3D?= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?CSLCNEvG7i5OkEk0KprVPWjeKa6r?= =?utf-8?q?De+nWGmulPUpMTojciXpp8eSbFzuDtC2AMCY3sf1QyvVaAJQ870eD8snNCN+SrNvl?= =?utf-8?q?G6Xal/AKjgUt/EDv5wAKaoCcxNDGx9247w8lzNnKnE76Oa/cm+t2hQFj+TGbD3jKw?= =?utf-8?q?7WzdbL3FGzx3mx8ZtseuxxRO9hdc202Cxf2bI5AKJa3ihEdd02H8QjwLaeBOjRjbN?= =?utf-8?q?tJibYyMOAAun65bPjdmFejsmd54Bsv8WuinXxaFtZXDf4bhUmMIoDNzWPVJHrJk5r?= =?utf-8?q?lNiH2N8Q7hzgUI+5EjdJESKip7TC5M6YYRVwMir6MDRKZ6E6VL2bGTHWB2CPMSH7d?= =?utf-8?q?PKnSMyxQf03LoYo50YHGCc0yI7rXWT1Amir4jhhdrYU2zam5rQ2ABnxr/1WuKx0Hf?= =?utf-8?q?PmuxAQXxwUSPIMvQf8HWMpfTQEremg0gM2l2ef4SCgeVxObgoH1oMiChnMPsqnVrF?= =?utf-8?q?XK5qglILEgmDKai/L8774OisDNeLveqHdoisNF6i2uF8hCJS5TLQJN60DG1sraz60?= =?utf-8?q?qH/q1vj2irFxtDabdus3SsuBcp5GraM4HDSbf2rGqbCPnhdVbhiXnvYtG+qOkAeCv?= =?utf-8?q?tMWAbqQAU/RPh+6+y6DudfsDShlewsmEv8sGZDpMABR+qiuxzRYFIQwwqI0TLqU6h?= =?utf-8?q?vBE7C9uE4fyU4CDlBG/akOKBAHdsg64Wnceffuo3Z74vZtR4cVKyUlJ0il/ojPuuI?= =?utf-8?q?aEjxjOIjDXxVjRNSnUPYHOu8l4wrwRk4ahzKPxzwJ5bnzlN5j3MmskNzgV5v6Fq0I?= =?utf-8?q?QrKf7qVLRBkoCPdiCRcCQhcWkiTWQkLlY/N1XG75WvQ7WffsRoKpu9AZFjWJb+9a5?= =?utf-8?q?jy+FbUnkjrubtn6HW+6qCcvd8KjpSG5V+TXMyRF89x9YTvYn0VbwuTB9Mi7GMLUD/?= =?utf-8?q?I+CISQ/cAheQXyGIfgw03ig4Eg+MUSBfBn6nzqjmSxbaqy6zocPn9lvqHRyIU691n?= =?utf-8?q?JPCVv0DZRzC+uAhB57Y+7kGAqN7kFaGSkgHKYR6hpNXaWqWD73/h5GFdr4mahURtE?= =?utf-8?q?EHEOF9X3FJ6qZrKm9E5nBPccyjL3iNQ+UmhhIxU5mobndounT7SI1cW1Q/I//oIoK?= =?utf-8?q?qTHX+6ADhT5LjTOMtCeE3416HTJZ2uCFr2785mzgsPJDfQxW5cztRyf0FacG0nkjh?= =?utf-8?q?+YnuGeN43Zfgz8JJQL/xvNJz5RNQNuWLzGlQO4nSU+ef9WZf2t1Jr45+4ZipHTIx7?= =?utf-8?q?swOPk8QHFZQJwhay2dyUurEH9nrBIpD3RHxeNWa1sl4m1oxXmWQfYngFMkESCg8Ze?= =?utf-8?q?Yc7EC1CFPcenvKPD?= X-OriginatorOrg: sct-15-20-7719-20-msonline-outlook-ae5c4.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 4d927c83-1a2b-4c32-8610-08dd6ea53ef6 X-MS-Exchange-CrossTenant-AuthSource: PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2025 09:36:56.3270 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PN0PR01MB10042 From: Aditya Garg Add Apple Magic Keyboard 2024 with Touch ID and Numeric Keypad device ID (05ac:0322) to those recognized by the hid-apple driver. Keyboard is otherwise compatible with the existing implementation for its earlier 2021 model. Signed-off-by: Aditya Garg --- drivers/hid/hid-apple.c | 5 +++++ drivers/hid/hid-ids.h | 1 + 2 files changed, 6 insertions(+) diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index e95a54113..0524893f7 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -486,6 +486,7 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021: case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024: case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2024: + case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2024: table = magic_keyboard_2021_and_2024_fn_keys; break; case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132: @@ -1182,6 +1183,10 @@ static const struct hid_device_id apple_devices[] = { .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK | APPLE_RDESC_BATTERY }, { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2024), .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2024), + .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK | APPLE_RDESC_BATTERY }, + { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2024), + .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT), .driver_data = APPLE_MAGIC_BACKLIGHT }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 8682e1b11..4925bfd08 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -167,6 +167,7 @@ #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021 0x029f #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024 0x0320 #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2024 0x0321 +#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2024 0x0322 #define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI 0x0290 #define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO 0x0291 #define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS 0x0292