From patchwork Tue Apr 15 16:13:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 14052422 X-Patchwork-Delegate: jikos@jikos.cz Received: from PNYPR01CU001.outbound.protection.outlook.com (mail-centralindiaazolkn19010013.outbound.protection.outlook.com [52.103.68.13]) (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 629EE1F5434; Tue, 15 Apr 2025 16:14:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.103.68.13 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744733642; cv=fail; b=s8btt3ETicjf+EJGNgl6D0Fz/sOXjJE/Y+TH5Xa3dzVLogWSg9Ee0iqQOlRglRR2C+8eAOQ5N1z2H0HiGnM+zNTNX60lT+6dNReW+q5UVOQPsnFzEJ2Uvp1kbWdMmNIkcyOP1YQYipILdQY/zVNyEPhrnQ+CJdX2L6sz74GGzOs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744733642; c=relaxed/simple; bh=Dae3IBbeqHqy2zk+EVFF1NLDBUcuuFjhagiZWrKyOYw=; h=Message-ID:Date:Subject:From:To:Cc:References:In-Reply-To: Content-Type:MIME-Version; b=eZj8V4qc8IDM2sngRlOcRhcjtS+oh6WLFfBfDV7CJqNTPPqApmc3TFbjbZMPWlBnO98lwKVQZS40JD93zDoOVrdo4AnqyMqLy5veqn9AWdc7/xP1CRhh45ngyzAw4dl7HkwsPz1ul2FM45/0863zThR+70wzIx4mEbH9znJGwsM= 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=c0SZMfyB; arc=fail smtp.client-ip=52.103.68.13 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="c0SZMfyB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZvnW01WzJlAIlg6CqV+QXsPDaBAeUdjNZAJmYUpP/HpSdZiv2aFZK39IG5aZhYxiBUHhuDvJ+T0lnRiWkEGSQTveXRUliVDL4OogmmudTSAVTzXI/gPxSbdLVsK0LnIPZBjufcOnpOL8oAiyV4W7zF88u0IuyZQIRMX+uHphhH68XIAHz0a/dQOMEIg3ac2pHp2iIcrsszI5Bbv+HRPUMmmMKzT7W6/nDYv5nhXF27pcSVHGIB/5K11N9c/eU5NbEE43hoFFW3Iw7KyPQKQ2drRgkyEkCSDHZFC0OCz8gvJUn0+pWoN+GsE3nq6jvGuKX39/04E/7Ld+IgASv+ZdEg== 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=9zQoJjd6VAXGyfhy2dULdfQPxOOXkj7MbUqSgEACHio=; b=LnO5XkZxRzD1rOeu0mw9Ij/uD3hsLvDVGPo20aq9rWJ+DvXhNS+5sfwNl9dvAVEZFIJvqheRO5ebmBxAdKcAPhgaQcuof9TSQ+sqFU3Of6NcmqSkAZ8xYspeToAKsTRh6ZfgnqmYcrF6brfwDRCYCuAQPMyLq1Csktu0aU+GE6ISb0/87UeUWIVvoK7PprDWZOnfwfKjeShzyZJWo9jkjLLRya1wuP+6XsnjWceePww3hWlTFSJEcyEbnd8U/SBabVLOPAjIeJnGr2s33Z7i0MYnxlsVPmv4wAi4jqO3G+qZvvRjMZNBTDanyre4UIg9pZ+6SvhPc9inTFnTNbJMMw== 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=9zQoJjd6VAXGyfhy2dULdfQPxOOXkj7MbUqSgEACHio=; b=c0SZMfyBoE8qZ0vLKk4eSm1e93P6XxDLQ5WnGwGDUtwoItQdQ5Nbyws/bSLG/3x3MfKZX55dfIf5QgPxVTHUJmdWACZva1XrAKaM/ZPnB/fuvFppAlFSr8eEUsF/okzXG78Fj0iy2cdTyzbLG/Xwta9G7xEh1EBC3ifXOiZgyHyvLHqLRz70tUMhvA56a5EEP3DiAxz3Iu4wDUq1fU/fJgozrWRrn5+hQzGELqFHRHmvJs8L7thdHcEEjFPaa55udWU9Yv3OVBIwAJqmgPszgJmi2vj2x1+ImZ8ew2piGikTgLfuS6kpJOGoyhJXDx0J5goxAkp4elVsPuMC9ybtOA== Received: from PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:f7::14) by PN2PR01MB9735.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:12d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.32; Tue, 15 Apr 2025 16:13:55 +0000 Received: from PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM ([fe80::324:c085:10c8:4e77]) by PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM ([fe80::324:c085:10c8:4e77%5]) with mapi id 15.20.8632.035; Tue, 15 Apr 2025 16:13:55 +0000 Message-ID: Date: Tue, 15 Apr 2025 21:43:52 +0530 User-Agent: Mozilla Thunderbird Subject: [PATCH RESEND v5 5/5] HID: apple: Add Apple Magic Keyboard A3119 USB-C support From: Aditya Garg To: Jiri Kosina , Jiri Kosina , Benjamin Tissoires , Benjamin Tissoires Cc: Grigorii Sokolik , Linux Kernel Mailing List , linux-input@vger.kernel.org References: <7EB9780A-026A-405E-AC07-DD33C11E7EE5@live.com> Content-Language: en-US In-Reply-To: <7EB9780A-026A-405E-AC07-DD33C11E7EE5@live.com> X-ClientProxiedBy: BM1PR01CA0154.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:68::24) 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_|PN2PR01MB9735:EE_ X-MS-Office365-Filtering-Correlation-Id: 65b904e3-e94c-432b-020d-08dd7c38856d X-Microsoft-Antispam: BCL:0;ARA:14566002|461199028|8060799006|6090799003|19110799003|5072599009|15080799006|7092599003|440099028|3412199025; X-Microsoft-Antispam-Message-Info: =?utf-8?q?RJl/OJZhvH4p9DB50TQnCU1PKl+wmYZ?= =?utf-8?q?N/whtrmRrP2RDY/hwV5j15yxDsJHC83gclqLOh1ofoQuiZmWTzJ6s9US1fF1R4JZt?= =?utf-8?q?nnvbmkvikzaWu+PIbOSaaf46hy+l85Qc48iV8MlmtD9aQCNfSflR0eCrsVKeja9nP?= =?utf-8?q?yVh+wOC+kUoYK4tTxPZN8/7tdnEMUD/Wu3J2kocR+3OHhau6PlRV2tjnCVW165Vxs?= =?utf-8?q?PhxTEP+2UeOcdc8ptpOCpiPOstfsWCWbtdlqQA+G9s+9QI8rwXO1MOC1LC/1YkoWx?= =?utf-8?q?6bPkbVAj3xN7vhFCjaPN6ED3+4toIZNceeMEGl4+QB+lyrcVQMmlc5eCrtcQ0FWmk?= =?utf-8?q?y/XCtiX4mCRDZqrYifwNw5NloJAfeqQRn8ykRATquNkjkCQ5Ah8pDk3eg+luz6zsR?= =?utf-8?q?gIJ6vOGF/vi7FpmNHZ4y82xe7r6FIxyK8DvMlMFv0Qe5qFD8xeYBpPxye7+4p0Dqt?= =?utf-8?q?7MYvDFBFooudAcy0jKjkpLW+T62HtoTKlObRZLkf5LBy4fCJl35/EJEDC5iEIYgY5?= =?utf-8?q?8/lx8fqSq+FbSSvScj+2vOAdlSmYKPp434h2A/na0GYfLMeg0NGi/yMkqhWcGp/HP?= =?utf-8?q?TKOVVLIUVoYbzeYsvwtGlPk/hy574CxsLUkNbjaQG2cIZEi/cYairiDOFy9mKl0gU?= =?utf-8?q?j2kty6jXx6OxYAvuX5wlx89m59wmC2Ds1wkMTftVuD3zMvckexiRjjV3xepPW0eJX?= =?utf-8?q?xqUt5vGQfW+RNQh6f5HjzcmHsEhBpI3a0FNMF7mdeGU3PBeKZkZgeHSfGEb8FPbyA?= =?utf-8?q?PUx7ivqKdSy7k18DcAVtb+PIjCl/kdOxKWLlKybRM16QraCcoZZbc4N9XPIspuPpV?= =?utf-8?q?PI8Y5hziyCwgojWiDLVnwGbzmGSeYNY8MktEsrBaybiUB+NxhDMNxLx8ah1PG5P9D?= =?utf-8?q?cKXZy65l2z1Sd2bqJ+6Pb733lO5cCXuM6hjK12roAXsDPWXnt44hwqzhlB7HO2sVV?= =?utf-8?q?PFrRQltjKLruEq9Oj3f64XZ4ioJCcXmU8Yr4fU4u/Gk1mom95627S4lYgKSSpAA8g?= =?utf-8?q?bi8pYpXwR8psR56KeJ4VNeQBqoHxb4ZKhq8mc5V4/qmHPK7GI6GOR3+bW7A0hSQZ0?= =?utf-8?q?3ZijAdTCQ6/x/s2pOy612lrbzV0iOFeHqVc2Jw=3D=3D?= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?L8VI5dwH44JTUGP56VOE1iY/93A1?= =?utf-8?q?wq/HwTw6ZZe6B4mNmjNc0FCdfquGBrmmFaK7Fv0klr+mIFR+sJXQQQLiRvzzfAmvv?= =?utf-8?q?iCcKzuUt7OK7xzzDPw69fhBSwoqsiDZyHx/OCsRSnTWvuPE0QzWbdxjgR2yystPjp?= =?utf-8?q?e7TLifgA8mrzY8d0kxsI8gu81j9+q1KeAdE8HyTLWSDyTjrwGUXd72sl9GcrtGe7q?= =?utf-8?q?hpWxvpkncXGaYZ8cHNFDK7BpMVX5qwlHMGaqhWNPUFLXvyO97f0WGyskkLnjcVoEV?= =?utf-8?q?sdrlHaDk0rlCw1iEwZ+W+NmQcAwNAYivesFjVzwoZ371ZBGnE6gAR/qo3Tx9UKSBF?= =?utf-8?q?G+Aqj7l09Z/0ZeSHkUo4LAobZcZXuPtAb6TqyZtCt9QjXyQldqAVipLC9JXD//fxt?= =?utf-8?q?c7VECbwIMNi9wmitZfrhe8kstqWaBTnKZG0LfrICwTHqMiCwbIKxKcnOraQ4mPidG?= =?utf-8?q?ixMKBlQ7nPL8jMFyCMqxE4k8KGJTeof1oNnQ2621+fNjbOSzXvVGsOGLckqHKPJ6x?= =?utf-8?q?zXwHpgmvPYTWQ57ruNyLwliJWtvDUk5K7DQye4QXJxFTeAwpjSTziWgQCh6kCep2n?= =?utf-8?q?kIYcGq18w4LKlSK8edbuMplmFP2yFTVxY5SmkJJbFOdshMv91wcmUeD4CvsqfxjNH?= =?utf-8?q?JB6XuM/rWa1p8Cd923R/eT64etOUOX+NgVFjk0SO0goPC+QIFjlsXRo9iFmIv1BR6?= =?utf-8?q?m0T1ps/x7tLUaQ09wf0uA5j3vliWBnshwWiNslo1HbKKI4HXWRO2iZOig8op6hjNI?= =?utf-8?q?Gbza+/aJQuuAtX78MXDRgfGuIm4k80uUOpEMCbGK4HHWVlmrV4INoYn1NIuMAY5hl?= =?utf-8?q?jjRasRMo5UOJR6ltP0MDxpWTQIiNbzZ0wj95gufTfYdsfQuTS92PeJrNsKacapa2q?= =?utf-8?q?Yqxmuf1W95IB80sCVWdgRb7S3JhBt1YMlX8qPRGk/edcIRjdAeFK0dFpRufRCGug8?= =?utf-8?q?xDxRC7ORnPmc8sVPXHmU1vqGVM7o2OXozdDKPxP6/Y2ATN36Gc6BTaHHltpKAjYtn?= =?utf-8?q?RxH1d+Cby7N0M8kyIZPWrgLSfXXyh0Z8nSZGc3ZRHdTRcRqFYss18PvBMrPySR9ZU?= =?utf-8?q?y8WMZ6JaA446Ak3fdkrdcKjIP2RjvIv2IoKW36Y3c4hJ7MU4Rm1O33EfqAIFi569r?= =?utf-8?q?5As3SvxClCPP3lO99JTDlZWPTofbVEkga7fmvDVIZo4ZSHVlppmLViR9wt5hV/CoL?= =?utf-8?q?8CBZNHxPxLQpKc+7LQJXeJOOz+rwYxZoUNY4Vkj9rUpPrOEaENWlF/Rg6hk51KygS?= =?utf-8?q?6eFu/IfOFncAuRL7?= X-OriginatorOrg: sct-15-20-7719-20-msonline-outlook-ae5c4.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 65b904e3-e94c-432b-020d-08dd7c38856d X-MS-Exchange-CrossTenant-AuthSource: PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2025 16:13:55.8270 (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: PN2PR01MB9735 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