From patchwork Fri Mar 7 11:58:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 14006369 X-Patchwork-Delegate: jikos@jikos.cz Received: from MA0PR01CU009.outbound.protection.outlook.com (mail-southindiaazolkn19010002.outbound.protection.outlook.com [52.103.67.2]) (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 B3E9321859F; Fri, 7 Mar 2025 11:58:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.103.67.2 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741348708; cv=fail; b=QsroGBSuMPb9X1c7BmSVL1wVH4cHhh2jKO477XTMRC8tc+R62kqgaX6+qR6qFAAcjHuyMsPqaj9PiHgmpxGulqawS64ZX2MFX8RiqKuKBF0wnznU7pZG/DeXnLnzkIWUBIWAXJu4mT9DcHE6kS6O0FqgwBjViN44/I+bQ2mfQY0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741348708; c=relaxed/simple; bh=IBELxxX4q6OyeJ3zR28L3k3xcZBuzKnoHKStqwUGYKE=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=Uy79m7uHif8F+93KRrnLGLc2Oa0G3pDiEuFiqbZCXWEFzDi5phFSSQotAPEE+SuAlL73m+v4RqU7wAJrAFn+NMcKVFQ2p+Sgl4+KVimGX4BXltbwKU91lD6OpVF8GDd4YbFKeyFp8OEz8J5C0Ngo934VK4KqGpGWfG6yOUJ2TuU= 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=NNk+i4hD; arc=fail smtp.client-ip=52.103.67.2 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="NNk+i4hD" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=k9zabe0fd33ivdpJMsOFCgdBkxJhFaf01b9wX0Bro6sDAa6n7vIIIbq61M2/RB22UkBvueALUO+Pma+Sk4EICAPNlwam8j3ZH6my7RD+gsrWed4hFhV1hCl2fcQwGM5tHt6+aZYrAtjwx2MZPUu/6yX+4wHDBWIrTPV81YP0/zCAjX+l1X/Ef2V6e77potO6y7VL3d6w4KVSDJBaIhOzpMD5PDEEWw2NochJ5Z5hVpPtbNX+mfrXvdwpmibLNX3SES8KuHAqUR6JsGaD0UO7Pkok9+ayLJdjSeS6Hf0g17uFJbV8TEw7fkMf89YgdDVm8bgdNLlj/NUOfvRddAEgsQ== 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=dbqb69CIhKSDNVEO0IV4UVWv/QX03g+zHBpMQ1yvBbk=; b=r94+xCMWLmY1FyIht5Y6vbJPsYLfIWn03nbr0lzpw3AlxjwzUmJv3FDdAds/FzBoaVsuPErUVmjad1TA8A+8mkYySvA/HAhQN0jjcX2dRFPBD4585gLQ6SU4e2USq+lzOsuit562AeaWeCzlRmzy0/mHBQ0S4TD8v4Dj8+Qo5zscyFmHky9k6woPisjOkC2UDG1s7MToJ790WxA9LqMbdAh6Up12Qujw9QESrcJZrstYZZg0dhDGlTWkP/+sU2bldw2gJ45L6p/kl/tg3n5Ne8hbibu/Bb+LHvXDTXG/sWPZvm4sxVUsn6ZkIXDHcMc2GUtPtfVRZg82H63yEejkjg== 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=dbqb69CIhKSDNVEO0IV4UVWv/QX03g+zHBpMQ1yvBbk=; b=NNk+i4hDJVXh0VYaJYuxS7IwHrXrpT/8CjB5QS45voEZtBm/SlvFB/OHUYAPGVyhD4p7NszXpAqFSQVdi43y0s1QJzC0wWOkYm2nG4ECeA88z3Omao9eOWaBFOS5efS6arKx3+DR/cBhVrP+t5yubQ4+Q4n+M0cLfsGs883RWcmIkHA66F+bTJSzGZhUOSTfMYvNwzh5uVe1iDYT/hUpIggSD2MpqF+wx2XvVJY998S469e6C0+yXeP+4SLyIJwnPRd9uzUt3CQh+rpaSeVhPYuNWRyOCUOp777Y/RvjXoosjZbBlcD4VdWfz/weM6nuBDaWCmJxeiakpCjdTO2oLw== Received: from PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:f7::14) by PN3PR01MB10324.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:1e4::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.20; Fri, 7 Mar 2025 11:58:21 +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.8511.019; Fri, 7 Mar 2025 11:58:21 +0000 From: Aditya Garg To: Jiri Kosina , Jiri Kosina , "jkosina@suse.cz" , Benjamin Tissoires , "bentiss@kernel.org" CC: Grigorii Sokolik , Linux Kernel Mailing List , "linux-input@vger.kernel.org" Subject: [PATCH v2 1/4] HID: apple: move backlight report structs to other backlight structs Thread-Topic: [PATCH v2 1/4] HID: apple: move backlight report structs to other backlight structs Thread-Index: AQHbj1g5xMuSKiZWhEyqAcRc5jw4Kw== Date: Fri, 7 Mar 2025 11:58:21 +0000 Message-ID: <301ABC57-8AEC-454C-AE19-A57DECB480E9@live.com> References: In-Reply-To: Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PN3PR01MB9597:EE_|PN3PR01MB10324:EE_ x-ms-office365-filtering-correlation-id: 4e471b96-9ff7-4aab-f1ba-08dd5d6f5ba4 x-microsoft-antispam: BCL:0;ARA:14566002|7092599003|15080799006|8060799006|19110799003|461199028|8062599003|440099028|3412199025|102099032; x-microsoft-antispam-message-info: VKS4qmxun8aBvIKISMRdDDhSlmPIyGryNLkLmUYwjtsqtPawCUf5eenB+s3X+wtywnyg/UxNln23rRAaj2z6bnCdL21+NbJA3IjLoqSuClZSw68Zz69Air9hsyPhu62WFnPlzrCpcUIBxdYYqWbCu9fO9DyAA0B0JdB1EotAzoumnZxW270tIllE+nlew4oIX6s7uquk0k5QCgYEJf1eHqa6BN/tkQvUL/1ivAr+V1NESnzo7gbAeFQAzqymHN2RgAn/MVPqjTx3uSxFmSI4HhWypsRkYMzElQQOC9dppiUSH4+1887OlkcdMD+CA+edlqF6F9al+OtWeJ/2xbuReb0/Py3k6+C+AAcJwNHbHTHRFToXvrOl8oOp73lT2yLeUe8WBZRFE26Dr/3NYD+v/Zkcx0zK+9uFLU9IEOQKOpjV2V2ePwmG89Bmro/YqAO3nA+oi2Oyjo0ttrQVNYM88Ld2mHvgd/CmSweYneaRlthQNn8QKbdbUseLn2x2exyCc6MqaCpRn8KeAWuH5kUHbe6NYPKaudrjZRS6a4bzsk6UgaC9zkTq3RJ88tYly3VLQ95QYbS3Sd1jqR+V6nmSCmR2AEukpo8Evjzjwv7QWIZyR+5TX+Kz4Qzq4J7/eZeXc8Y/12VZBxF8UiooQb2cpQxLlfWSwJh5I6A36/yEctJHrTeBS8A51wH21ncVOwkF83vBQUYZNMMNUbTaOs7wl05Ms8k8kgwiPH46qYin1DE9xxCf3BVMhZx+4sirUbZTOrGGzcZk3isWD5uS/HW1zp6Yhh/NrDpjhqqQfQJvAEEvLPKB+LKm6U1IO1635tLf3x/pykfE4Tmjp2q+s/FYgkbH2VfRkLGRKU5BbPulDPaX1biOkTkQCFW/3aggotOcFlOLFETzv6VLE5ktWDKaPeAw32nkiha3ijoUElA3VVjird/DjTFqtfk3myjXru8RyFvI+ed5oBjYdaOV59+habCjn25XDqV7vQ/8gJFXooZ3aJud7cLb6YJYGDoM0BUneRJnuSe0DeVFGD+MTi2SOcPwPAdBr4xGl2uwb0mVhx5smgga/fjHcabYXDYtuubzVd/9bpBc5GxNVAniuf6XdQ== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: HgTtLtw8zGGKSCEVt4SgFnX07vKMybIZXwR7r2UnKwCUyJzdAKqS5/ujD627kDRDcVT4oZ0L5JS4zK7u2g6T6Vj8Xcq5eHowfpmYmuLR+pWR+W0kmmTDUcd3hO5r/oWGG3/oxQ5fAAE19AKapOzp7d76QEgF6EMA+lpzbV7PqBDYraj4BIcAMMxJLaVjQyVgzuuT+Xrt0NttPGdEc/T9yDi8qQWYXtN3EDjPCByv3Q7w2qamVjeJHyLqYUK04rEJO2XRHmMh6W6zE8E/keTfcSvRPK+TNu5dT2ZDc+Hh//nNdOgE8oNgIPoUsKg0vuLOc9c93WFPJTb8b5+etkLsk7GF0yC+pnqgkADaXBZeNOMlvkPaaKe7FUx+bnB5hhWR83mGwpGRwaxiAXzR5+bGkbxS34iMUin+fFB8R/pUFAKty5aOznB4EUBr3aJ9kQT6iC5lH54zveTN+e/VuaKLnfBIo4GqSdUkrga9XLEh3Jsg2sZEwjPgnqmubnLyO1ebJbt8/1lTpQIZvef1vINEL7jYDmoFRf7QPztORwapPK3qaMqmM64qi+03YTfDukjabmc0t6vDuH0prEbnuyP6Qq+E5kfRVDQCJD7OcFEqFy3XwKzClxW5NXoR6bG25iQ88vR+liR+9NVa/xKUkdWaMKMV5aQOOApIdWMQm5VtT5RYu5tFaOws6LyaK86ifGZVeaXlmziWFMOyCTCTiEPsbHoaTq8uCBAi44tZexMNcwMpg7jfUjcS7hjwaG2e00AaHL8WGoygUyw3Mm9oSSXvO7aQK7nxG1DpGyNURiq3Gmgpvi553rCiDSKq/1tN8P2GRyZIdYxghP3qWywn0M1dy6UcRtG8YLPBstqirJ6uV0mtWUg8BtFbFVyBKqoZLgEsXWkn/OR3TI9L61R1LmJa6ZuRt7qts5dUum9su6rjV57wTpBoDvcW8h76T0O65DWHOVMaDk/naf8svSrbhacf5Ek1xf5WU37224v+9LAJy+bakuMVpFOqbnyc0L9fIEk/mWqtiog3cQyx/N8ky1xSJqnhanHc7BNd6Wc9AL8HZZyNqFPC/CM/TZPu1skBBFiRXERWKVAjaqyGrkRvy/4lH6Wx1uH9MWOstba8961sU/QdIuu/QVFfbmdGVB75KYVracr1kzJL2s1wnaEDm7yhlFinojV1LL+pua/54IqItBz4Y9jI7R7AtDqxbsZMRyF8kRPvTmlhxdb3dcC85DBAapyE4cLC+cPqnzb6W7uhQLte5RITwAHlgd1eGWEWuzeWn88zo/H62RnhzLdxBt4aJGIv65IRM2p1LUrOIGFj1mb35ZP9UGnHVEii3nxhuaj5 Content-ID: <590055BDE5C9B940AEF80559D286B12E@INDPRD01.PROD.OUTLOOK.COM> 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-20-msonline-outlook-ae5c4.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 4e471b96-9ff7-4aab-f1ba-08dd5d6f5ba4 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Mar 2025 11:58:21.6408 (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: PN3PR01MB10324 From: Aditya Garg The apple_backlight_config_report and apple_backlight_set_report structs were incorrectly placed between the translation tables. Fix this. Signed-off-by: Aditya Garg --- drivers/hid/hid-apple.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index d900dd05c..93b990603 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -89,6 +89,19 @@ struct apple_sc_backlight { struct hid_device *hdev; }; +struct apple_backlight_config_report { + u8 report_id; + u8 version; + u16 backlight_off, backlight_on_min, backlight_on_max; +}; + +struct apple_backlight_set_report { + u8 report_id; + u8 version; + u16 backlight; + u16 rate; +}; + struct apple_magic_backlight { struct led_classdev cdev; struct hid_report *brightness; @@ -152,20 +165,6 @@ static const struct apple_key_translation magic_keyboard_2015_fn_keys[] = { { } }; -struct apple_backlight_config_report { - u8 report_id; - u8 version; - u16 backlight_off, backlight_on_min, backlight_on_max; -}; - -struct apple_backlight_set_report { - u8 report_id; - u8 version; - u16 backlight; - u16 rate; -}; - - static const struct apple_key_translation apple2021_fn_keys[] = { { KEY_BACKSPACE, KEY_DELETE }, { KEY_ENTER, KEY_INSERT }, From patchwork Fri Mar 7 11:58:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 14006370 X-Patchwork-Delegate: jikos@jikos.cz Received: from MA0PR01CU009.outbound.protection.outlook.com (mail-southindiaazolkn19010009.outbound.protection.outlook.com [52.103.67.9]) (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 15C05218AC3; Fri, 7 Mar 2025 11:59:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.103.67.9 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741348745; cv=fail; b=bnu6qErx3kmBOaYtL/4/d5AEnlXANeW5GX3K88vZgYKve8pCsxiGhtY27zi7p5NFdMGqrg2ZtR6vLFEc+HFVwAgKAC92Po5XPx10FgkGlIVozY7mhgaE9hi+FA5g0AGxazBasHRrp/6qO9fyonLYL2SA3KHbECzxXXrgFjAl5vw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741348745; c=relaxed/simple; bh=PeiTzW5o9wKpnyZDDQe10Dmu4K0SkPHy8pclGTcW+vw=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=rKSNekCO41NQv3fwUXK87WyuYzkMgcs5tBo+Tf9FroWtj/4t6wYX5mrKfi9XyxxySKg61cQ0zoLgFuSOozsNteinvZEWKxmdGz3jY+pwMkJnJPErkfbFQ6GElqc1anKqE5UcrAhBJV5F5ISIIshqEBWv+K6qWvSdBo1WAyEVPFc= 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=F9O/iRTq; arc=fail smtp.client-ip=52.103.67.9 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="F9O/iRTq" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dV2pRxhSH2NDUvZ4z65dEn+rtrc5R/YaSKOW7LOTWqHMKO2TSGaCkKztGsKoKoNC77p3sTD5adJM9ZWp3E0sF+7qbR4GaAPw0XsLrJts9Y2/vEnENz+4+stoBwlulNeiRSkY7aulqZGHHdvI1BYFrEC1D18M/omxlM1R7THX99EKMS+8DkLAhAH8VAjvCu+t8r5/YHlVrHXOjW++QXntsM24KmCXVFoPaHprWZdVjchbC89SFUlgn6TqNn3FlsQ299LUwot5OGVIjL+sJn/039yLbZ01nJKsMMRgweVmpRMXJAK6UohjvDXIZbfMxZd/sc1HxLVz5vsFvSW2wJBZEA== 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=JS2jSA0c1p0hWrd6JoRRE68rFn/0+dHUhqUBnRc5TKo=; b=oMJmYfUgnweQVvyRs0hsg2CoED55pzLkKX++SKERRKNS808KLMgA6SdXD8STbqMX/k6QgBU4CBnFUDXg4cZquLJHMmjXa8TmFSkm+hNHC6RHTEDXDqU5OuNa0gmGR0jiRqPkZujhW03cZROvtbcikK336N23tHOElG7cAyy5xOotcTUIh1Gi+dkYt83oc1oH4WaValquBtEOV5LDwPW5kiJrR/MFxnyPiQOWzbIAquhIo2Oxc/hU2O6rBRa8Obxw5MBh4iSv9dsVJvKgwyPrYLWqqKpDv4PJ+p075jP49Pm6LOHibymLiZ5YJ+v+cjb0Kcr2Fs8fCqYqyWPPle8d5g== 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=JS2jSA0c1p0hWrd6JoRRE68rFn/0+dHUhqUBnRc5TKo=; b=F9O/iRTqjsiDne5ouksOaxPDfS2BesdvsfL0yINAzUQqO28pcx+R/0W0uMbht1+rX3wjuYLQ9SWcondJoai6QPhzftv0PfQm1yD1lCTGjSmD/Dk7hmdL3V8k1lrb8XRs/iaRSv/YSDcFufxK2cnumI+ygEdcpRvXRA2YXIifSUdIFnuQF0ZtDDLiQnPeHwFDUnQ5Ztt6Seb9/aLPdXsCL6aVPbIOFK+63TjoCj+ESazRpouRw9xLjgTf9lOQc2vOurXrcOtu4FZM1UDS+4oKjT0ew+ZkTloen1bUexH3TKUMG8VjBqkA2T0yqPrJdWLdR9uR22Z5/XfTua26eAr9Tg== Received: from PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:f7::14) by PN3PR01MB10324.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:1e4::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.20; Fri, 7 Mar 2025 11:58:58 +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.8511.019; Fri, 7 Mar 2025 11:58:58 +0000 From: Aditya Garg To: Jiri Kosina , Jiri Kosina , "jkosina@suse.cz" , Benjamin Tissoires , "bentiss@kernel.org" CC: Grigorii Sokolik , Linux Kernel Mailing List , "linux-input@vger.kernel.org" Subject: [PATCH v2 2/4] HID: apple: use switch case to set fn translation table Thread-Topic: [PATCH v2 2/4] HID: apple: use switch case to set fn translation table Thread-Index: AQHbj1hPe/Apnv4JUEusqFQAUo4b0w== Date: Fri, 7 Mar 2025 11:58:58 +0000 Message-ID: <63EEE173-8989-4257-BE21-C5A8FE0FF677@live.com> References: In-Reply-To: Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PN3PR01MB9597:EE_|PN3PR01MB10324:EE_ x-ms-office365-filtering-correlation-id: fdde1077-d243-46bc-fcd6-08dd5d6f71ad x-microsoft-antispam: BCL:0;ARA:14566002|7092599003|15080799006|8060799006|19110799003|461199028|8062599003|440099028|3412199025|102099032; x-microsoft-antispam-message-info: fEXs97tSW+6RcMiEjg+3P/JYki1MTVUufXBBFo3Kriy6Re0COLTWqpc0ACdy9SA/gZ/7/woyQ8E1guMdAqqo6ipJ6ifCqGCQyOKvMsP5RL0AQAhw5noRKAUzc/u+7pYntBH5KNZrwakmOPdJNDFo2X54NtDA35I5qOv2/jIQ+5xqym022n9bgBdaVvjW/xiQ1oXq2JjIV+dskxPGZcnfnKQlZNj+FNXd/OW3tGJwXjfw5M0oWjeO871xhObXn5c3EKns4fMa0v1RvW2x8tffFy4IcozVRzRyrVfQ3twHhoCpMZWu3OP+ag5Fvd4hSOpyQGz7G5/ktXu5PKek+4qLyVSSOPZ764cI6jVmARmo78hfOhuAnZ9HI1oQicYm0T/ufwlEWtawhJdi9AwnjdcXZarJY+8BytsxkzIbk/+vdep/eSNOWzNiE6YAzDTqcY5Szt3wh+Qe9pN51mKL8DF5SsLdoE42rqBHKRxdd4fi4RBsRLORupdC1nS+CQuBXxrydimzqvTpFneVb5TQptLWEGVcY6wRVbp2ouJW0HYunhsI1KoEcVk0yvBhFIVoXMJSg4uwJwPu7bXyEX7eOmAIEskxxsbKtSya/vrtq2zCWZ1aGWjsUqHK1J9oxSyyg8deLcHFaCnkDS11aFrZGvUK2S7+B2RX24Ae0XNXD10389FJY9D7YjB8MKTARgrmKP3qaSRe0XjwN2QZ/g48jK4nPV9V7OhGfippvqsHDByWD1nuHWjFCeVc84lxUVlQq+HfFDo0EiiD01lzWx2pTGOAOjl47BvundCH/mN8i//3DBn1cM4/5VaXYj569KOL2+mMwJzMX4AFuNdOBLW/8lAB3aLgb1ml15f2N9jJKmszC/pPKrusALui2GTZfsoDv301sdwLdpw12k5kfgn8G2cTv4wt0j+4umD2yf4uW4ZBDMArHf8oBpNF7OxAEmT+trud3nqXpVlyliIw8BtRIbv46lDpFREpmvfQZrKmcBIKkENNqRvF4eZZcRu5kzV9lHKYuoTpHkwT0PDYA24T1zqN13KGXl58fwVvGdiA4WtY97j9oMbbFYQy+7khCS5G0LMItc35lh1dA3vUct2/QHKCfw== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 202uPUGzyOuUEi6sF9rkmr/RsEBv5sKP+1FrNgoT7eqRmhykamYqM9nTdKB+E1+sfJ6GYoZcrdhRsCRik2uzqpLD0lFKjsKpxPcBRwph2qYY6/sTHPw25hdKgFCfSj+YYWwMiu48AJYQHLb6T2S6q2BMCap6Yofb02HjMPXcVlhjZLHX6brezE7oNEGf9mmCqfBiZ9g3cD1Rf9eui4wAGVLreiHaHby4kGXi47x0nrrXsZW7XO+gX69eua8aMgpnZ8/RMK0fSNb71GkaPSp7jnHmo3/G0fwEriyGChTJdIpJiHojFhTpnH2icbKZ+tcm7XUl3CTr66vhH2orC9052T5eL1W4tODFAOl0MmffBmRg0+lMCrFM347G0KJ+3y0WFFx1MRcSasIfey+sCuw0tOqelkWL0FnGaLzx3s6jRL2dQc4yIyH/3XdqGNNsgC3nMSeqgmhg2YSYURkWxMeoVryY/QQ50S7r5XDs5408VgVTK5nipowrz7rZ5tAYcoEESgvwogvyg4N37Hw8sTMzJF0+K3O5Z4Q9LsgRhup2FsCdmBo9nW2gj2DSVdrKW9uJ3an1x7PjeyPk5yml79jqXFcf0+3flsKLrJRwe7ikRPCMElgaw3N8HH+dqt3HS8KcbHjr+J72NDF+PnKvQALJmCzCGHSPO5NOWrYWUKst5OnF+lbF+CqndW8mEMZGeaGqTHDQiACti4W/9DV0EVNC/BKJUTLLqPfdVfTDhqVbXkmh4GOAjNUv3kS6xdg4ivCkTr98ivSdK2vNZtZmhx8qOBFmvWMtvfmTLHjy17cAV6oz1foVQfkBxAdGN0oEGCV6f4T1zzPYkXdgJTenFrFYDkw/IajmI6cWlZHuE3e37JcFFbNLX8aSGC7NW2T726S45kZ3+x0GxtqL35oLm69TDmqLEX/aWvGIp/GzdlApLOx48vi4xDhkCRhFfzaW46tKgH6PuF7koYTZ8Lw2reLX4w3Of6t7NbWdkwgz8DPszDJahmW3Gm2g7tL9hPxxNsEnGvtCvASZiVClhx4KyEOL8GeHm7FmWYsOVosmAh31ibnr6QLAOe9GFpZx3VmTeB/hzyeFfkA63vopwloEE632j16Ry7CNo3jYRD7oApzza/c7F0ZEKsVWnVSJgaA3SU4QIuvOygxGpVb+LSwZU7N9xxGYUGx5WN9DyVr8GcgYDHHR9BlgvqdVb61agAgZzNdgxQI1AG5c53Ueb7uWaCfsH6zW7S39AyZpPSXsx/IKCUZLlHr5PSXTuJI6ZK8hGvVURMDi5PMFgVkLGYe8QLGayK6v1vpwbda6c1KdYUSla9yiMyuFSqqv4Gdyg+aAWcOf Content-ID: <63B9DC2D18B834498D692982F03200E6@INDPRD01.PROD.OUTLOOK.COM> 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-20-msonline-outlook-ae5c4.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: fdde1077-d243-46bc-fcd6-08dd5d6f71ad X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Mar 2025 11:58:58.6108 (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: PN3PR01MB10324 From: Aditya Garg There has been a continuous increase in the number of devices requiring hid-apple driver during the last few years. Moreover, unlike previous releases, the PIDs of the newer devices released cannot be combined in a specific range, thus filling up the if else if statements with individual device IDs. For such large table, its now more suitable to use switch case instead of if else if for improved readability. Signed-off-by: Aditya Garg --- drivers/hid/hid-apple.c | 73 +++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 32 deletions(-) diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index 93b990603..3d7befe0a 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -465,42 +465,51 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, asc->fn_on = !!value; if (real_fnmode) { - if (hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI || - hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO || - hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS || - hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI || - hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO || - hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS || - hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI || - hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO || - hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS) + switch (hid->product) { + case USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI: + case USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO: + case USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS: + case USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI: + case USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO: + case USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS: + case USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI: + case USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO: + case USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS: table = magic_keyboard_alu_fn_keys; - else if (hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2015 || - hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2015) + break; + case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2015: + case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2015: table = magic_keyboard_2015_fn_keys; - else if (hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021 || - hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024 || - hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021 || - hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021) + break; + case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021: + case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024: + case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021: + case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021: table = apple2021_fn_keys; - else if (hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132 || - hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680 || - hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J213) - table = macbookpro_no_esc_fn_keys; - else if (hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J214K || - hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J223 || - hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J152F) - table = macbookpro_dedicated_esc_fn_keys; - else if (hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J140K || - hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J230K) - table = apple_fn_keys; - else if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI && - hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS) - table = macbookair_fn_keys; - else if (hid->product < 0x21d || hid->product >= 0x300) - table = powerbook_fn_keys; - else + break; + case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132: + case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J213: + case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680: + table = macbookpro_no_esc_fn_keys; + break; + case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J152F: + case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J214K: + case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J223: + table = macbookpro_dedicated_esc_fn_keys; + break; + case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J140K: + case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J230K: table = apple_fn_keys; + break; + default: + if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI && + hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS) + table = macbookair_fn_keys; + else if (hid->product < 0x21d || hid->product >= 0x300) + table = powerbook_fn_keys; + else + table = apple_fn_keys; + } trans = apple_find_translation(table, code); From patchwork Fri Mar 7 11:59:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 14006371 X-Patchwork-Delegate: jikos@jikos.cz Received: from MA0PR01CU009.outbound.protection.outlook.com (mail-southindiaazolkn19010005.outbound.protection.outlook.com [52.103.67.5]) (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 F38DD2066F9; Fri, 7 Mar 2025 11:59:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.103.67.5 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741348783; cv=fail; b=qy68q9nnDsjmjdtSQIaew4jDTPlYoq5xxUnahNw7DmbXEnkHvVLogUd8DSenc6gRImxsX99H3bYW19Lhvd4RePZs4B51hnFcESmcElUk8zMzJQqeIcEGCO9G2K+gev5Vg0b7w7LdpyOKbs/phAgm42b0qTnHh5FjGxH+KEY2lzM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741348783; c=relaxed/simple; bh=WHUUh7QWuN55HvSFusPvS3TggS8reqD8qwZ7Woo7cyU=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=sFxqpB2oJ2BzHl3u+2UA0z2rGDpOjzjtYUFdirLzc+d/hCkZvR1wBZF0QnoQOxMaBCI/fUC5EmbIhxP7Qp7YKAG7FXBcwoY1zsvi1zBRMSyPV0zh8kELZcfzjutQz73pjwACXZABgB/2qEHISsXXzoLScmPVpyqzl/pedBPH9u8= 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=c4UCmb/W; arc=fail smtp.client-ip=52.103.67.5 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="c4UCmb/W" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PX6BEgwTRFQmDYIYqfVTBpECmQZedgsu3z7hKs1/dKmZiKXf3u57BOkN6Yp8We/hzyrD24guXhDj6XjQGaZXdz3cABp60Wq0kZjY7BhD+BvYORVVoBr+rDIgsiJsSp1H6sx72hL/B8wLb7lOC+CTnia9KFtuHuozFy3SDUSwv+uCI8mKPU9XTd1+hyJtC9SycsmxJQwFOg+Ce8tIPkWB0hWIRqGgINZjkVujT6qwhglw9K0D7ukDYN7iwkj+k712P37OW2L2u4iWOz/rXSC/slH6tKAa3kScNvywnfDRKsoDVVPHuM5EXwnhMkdGZjw/94cyTakl0itr3uxS9rEVbQ== 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=NfURnbVasnG66phUTNDFKcKrWjt3s/2L+KXYWRPcngg=; b=I7fGHI/OHx0BkGpLOZNpQSLFKYlGWV/EvCg3Z/xX+Utd54mGzYGmO2QfqsxaHw5QzLe9Q9sJOSTz7OxPwMD5kNX52izjpz/ONmPhdtdpOe9MhA02oTwjm+gqoWYw/+CpD/WxvneWkJTxdIJBoDK9o7y4Z4A9PdyakFpnloE7A2q6BzMZouG526ZgeF9te8kYbDRamWbHJRUM/CQR2ww7ljzre0OFaj+N0gYuBiNwza+1r4uWRb0Bh7Vr/UyKL6OAOTPOKC2KOMeLFYd2QSFZ9Ez/p/L5Vl3xlaJY3eeOgJ4/DY4lA+Lo1fGFeh+ol1zKePMX7Z1fo13xCArqkhqJ+w== 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=NfURnbVasnG66phUTNDFKcKrWjt3s/2L+KXYWRPcngg=; b=c4UCmb/W4zbmdv1r4a2Ky6dBpzbT2buISMkm0mwrDpW/990PAJ4sXnvb7vajYx71YpTW6KMOo1mvm/KZv6al2JI9N8KsUODVIuVUmMrEjKFEe7KJXN56d7itZZEGk5iPKJTy2A7vBVpIwA4r/5MMW1W5RWDHzOglXiGr4u2X5vy7AwRw3WC1To3CtGkEeI74rI+XAO7bM07s665XzOLVZ4TpClq2v+2XYE+683+z2ppZ4DAJ0GfoqyOIYl+HDXUFWWo68RKGdBzrPzKSr/cLraEM/ZAUpKVslLxtiUhq1jog4n4+nAjDRWnK58N3KjI1FAXk+X9o6J3LuJmc90lkOw== Received: from PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:f7::14) by PN3PR01MB10324.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:1e4::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.20; Fri, 7 Mar 2025 11:59:32 +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.8511.019; Fri, 7 Mar 2025 11:59:32 +0000 From: Aditya Garg To: Jiri Kosina , Jiri Kosina , "jkosina@suse.cz" , Benjamin Tissoires , "bentiss@kernel.org" CC: Grigorii Sokolik , Linux Kernel Mailing List , "linux-input@vger.kernel.org" Subject: [PATCH v2 3/4] HID: apple: remove unused APPLE_IGNORE_MOUSE quirk Thread-Topic: [PATCH v2 3/4] HID: apple: remove unused APPLE_IGNORE_MOUSE quirk Thread-Index: AQHbj1hjsF2yEwn5OkGqk3x3FQbZjA== Date: Fri, 7 Mar 2025 11:59:32 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PN3PR01MB9597:EE_|PN3PR01MB10324:EE_ x-ms-office365-filtering-correlation-id: 351633f6-8edd-489d-9d0e-08dd5d6f859e x-microsoft-antispam: BCL:0;ARA:14566002|7092599003|15080799006|8060799006|19110799003|461199028|8062599003|440099028|3412199025|102099032; x-microsoft-antispam-message-info: rxskW3vFZMeTCRCtvDPrAmh1FR4fnfAEajsW+kqn9sB8gFcZ1Uw0xF6voq7z5QJu0n/MC9F0dtLjvIBkN0ZtZHFAidsNo6TQZhjygL1a/UuktU5J4BLwSlQ1ezec9yk2ACS8YosQ2MD7Jpj7LhcCRiR9GmKyb20uQ9WNBnG2mSVxDEXhGznBikYtEhM4v0pURBKHJEQd5gumJiLdZDy+x+o9tKrOVK9dpzQ68PcrGZSaOXWwOP5GYlhy1x8Y9P0z11r2NgIFFdhjW5FMBs9wjDbRTqupZRkq3VO1E0kWnxf7WalEUJyW3v1XTCpLgz0ImixudpTbOrHR3mouTgtPSyi0ApDVWeOyw4TCpb9sWvsH9OZAPTrltqJh+RsuZ2kycptOZODjl85fJYDurmwm/YvbZ/oPVcexcdI++fdvcPSRxPAKEC/zQx1K85fpdK84P2EvGN+sM1w7Y/4nY8BYLh22sWsT74csEpXRzf1YMSUdy7RpZ/N/x0LMam1wrltO2GBjTvlXUKySD5mXSkpPBBf6B7xR0OfOh9LpySPYzx/29FcY/OlelZ/wNtuxs/cAzfEhxbO9m+9SxNqGqAb4GO6X5/qrCQOS3HNhTNa39DRohV8c2Szk959tUafRgp+UNnVIezqThwDD3ibgyraYBPPwh9FMnUEjltLys4dF1bdR+r0vIGrJe+Wv9jDqHb4RZvNAkJ5hf5BFAYc2kdNZCEUBQ+Iq7WcSFPOtz+lt9Qy0oPbhaukuVPZB9Owt4DlhDgIsU8xvndtgFIwskmHFCUszHtPq/Q1rqprqWjR4awPSqdD8KKfTXw9jnTo+xl6v1zksvpHDx3H0EOBmuKmZknXCROrzvrI18rsY2sVYWXNKaniMLKv51Y8RIST4r/Gcbf8KeTPPC/FtTSaDeZBysIiGB1Glwzkbht40H5qdmnHoSbk7XffhxPDoCPS3WlphpUQz4kBtLExT3k5naZSfcX7Asgsg6RD3b85RB409biBmCIgmHVFhwAc/hYCzOp0Oe5FtbdDP93tfA0LX8aVtqp8rKilZqkhw8Xx5PCa74dgegXuEmYVCFuZ5tyqeRrOaabQ/QHW6JIrtLQkoRBlR4w== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: aCWhVPznqbjoGr+2rSAvVWyGhEAOVrMIli/ZIO9LmQvDkz9kHrE2B0Gl4mIRAPjiXuAY5UiUYHi2nYyGo6iuCjHIu9dRJCM3fIB6XgexX6i4D8ELBX4AFmIa6KmgfsDRLsapbhIRhJcbdcdWScXX2Alr3pP/jwv6drE53H5j7Y5NlpGuEHnrHdiMmLBTkrDBOP70WFN+R7zgJHiBWH2uNwEQwilr1TJY7wGZGfJEiGJINTj5ffF0gnePVbLodIw+Nepe5RUMbgXUU5KFSmwMfz1fQ41otV60P1z7hzEUo2EikCGejEaOPr3PNrgx2Iev4x4m2oEiYeX5Qf+aCUOjFywI8tEpxlSrHKdkiZrght+r3KzhxgHt675hYwwbbL+TKK0zXYtWwPagoY02dsJAe5UP8r/Fx+j4wIYe2y1sevE/Ps0VXTrq/GNH12Fsbye4mvr5rAHZ/S701KpI9wY3F2T9rIH2bvq1MgOi8JhOiIaBxMv37FfgK6i/cSo0e/cBn/DUVP0+qfiA10cdigF3LGQtB3AIEcOo5InEEobiqpaZhBndUxmZtIo5HKOlv81iBiUVw3XBqpYtgUSUvDrA+trcqKqhW8X0tz311tuay7g/uAgf8ju9ZNH0lM/CbILwjtxT2Df8heKobe2bmmbP7paJitTO6Y+hYtUizpjqgXzA9r9O/7HYd4os4Afj2zNCudWescsHnwCarQrKBZcaJFF7roVf1D4ivLf5wMNhZLfDcfzGdfrzvbRCtXctUM/RGX899EmCLFnHFyq6Hnf/IKSxGFDgt7CdBWoB/0aaV918SbrerRSMU2NbLmmeOAPcvHinK46IQ0zxtY9SR7zed84gQrTerp5HO6Y3A83uydSGaoXfh8O6MY1tYIxAIHpFevAUaqjG6p9JvFFnUWAM52snwV+R9TduUAnLWKt2SnWVA3LIbZyPW3RUon8Mszp7luC6t335/VaorNqVtI2PxB+CZnhFYuUMax62Z2PMVXgafZA95M/+63VX/mRS1gDKEGbPgVROPAC8EB+MBS2xZb9W+NtnitmCPyrRN52ZMZrf8m1qlA+luC+njmBgZYKOjhI8/pL6ZfHefnOvNjhYay1J6jHz1eZneWaOwXwkdYJoVQpCcnbEFKtvhOfcb1JQWRZwmiY0mRIL22jlwk4rK29F29jdgPo8LvLNYbEwILXiENrBOOZjhsqrWnB+XEt1MwtCBr4+IvSIIThg21Ewg2kXkXanDQBvNhKE+1px+ULQzvtdXZM0NYn5a6KudMk9CYfRZkc6aAramk+EZZ92kMJgz13K92v1aBpmuy9NMk0cwQiNaZ3PQ5dZkYECt+cD Content-ID: <99EC3F8BBB408E4A993E72E832B8CD80@INDPRD01.PROD.OUTLOOK.COM> 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-20-msonline-outlook-ae5c4.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 351633f6-8edd-489d-9d0e-08dd5d6f859e X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Mar 2025 11:59:32.0381 (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: PN3PR01MB10324 From: Aditya Garg The APPLE_IGNORE_MOUSE quirk was not used anywhere in this driver, so can be removed. Signed-off-by: Aditya Garg --- drivers/hid/hid-apple.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index 3d7befe0a..fde438bee 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -30,7 +30,7 @@ #include "hid-ids.h" #define APPLE_RDESC_JIS BIT(0) -#define APPLE_IGNORE_MOUSE BIT(1) +/* BIT(1) reserved, was: APPLE_IGNORE_MOUSE */ #define APPLE_HAS_FN BIT(2) /* BIT(3) reserved, was: APPLE_HIDDEV */ #define APPLE_ISO_TILDE_QUIRK BIT(4) From patchwork Fri Mar 7 12:00:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 14006372 X-Patchwork-Delegate: jikos@jikos.cz Received: from PNZPR01CU001.outbound.protection.outlook.com (mail-centralindiaazolkn19011038.outbound.protection.outlook.com [52.103.68.38]) (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 B23C1218851; Fri, 7 Mar 2025 12:00:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.103.68.38 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741348813; cv=fail; b=WBcCs0IV28La5xt2ECACpccKRqSKFQavT6JNuF0XRdIgcTz1QJgMX7D8Se4D3Pfdu36pUCaR3v021Hukw1LtYxH3cBu3sB+obx+mkGctvZIg9ZFSsiIyDQ9tHHeWtjYT+j9t44tZBv1FAvjpSsaJSwpPWdEdyIN+/LtGD+9mhpM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741348813; c=relaxed/simple; bh=tLZ0OmJcy24TnMpOgxdiztEkkV/tBe7v131CDHfNEoA=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=sMgzuBe/KQ/MPCfnOH461pDmuA9XKoSlQKmrr81t6CRw4vVxZCc+hPuYZd6TnPKuWXeD+ZnCFHMcGmyi2yoNqc6sPqaFDcJGhGJg36TnGb03qW0dfEq3L2XkaknNNownxAiFu8PGW6zaRAB/cuMFZ/R/fNpzu3SHd/cuZhEiy/U= 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=ad3khcK7; arc=fail smtp.client-ip=52.103.68.38 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="ad3khcK7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=U89NVpoe+e2amahJHjGeOkIg9Jdx6vonQMCq//WP69tXIw5lM/zNEiYxDpj4ky/VKYAuaJwdFW7yDifiwXs3FKOtxbIWx/cRLU3MfwjZUn0BBxPBFK+F5xlxES0vwaCvriFY3Eusrs2GrQA00Op2UfhQJPUD17s6RXbQPrFQIF9bBaRZsUxQjdoEKWabulkIjyEYSZrtsGFfJ8TLYVw0HQXM2QO+EYk1DlDdSkBqM6w+fez2W3JconZP8nnNi9uGA8w5rdZwq7g4Aid9SzrtoKPt0OvepCc1o5Dp9xC2Glxl/431iJsYdJiDOA3KfErcdooQF0c16X8ZaSuOKCzyLg== 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=O6u6sPE2HZSVk9t3KGS3iE9yURMQvASLhwWStL4o8OA=; b=dNqtI5hG9ejFq1lrklz2du2JeTIhF5+hz4imgIzKtEU2cGLXX8uBwc2C1pc37FEfHillkiIoevzOoVlQf96Y33HgtCSIcjgukCM9NYkROU0ikX4icZm9AFC60rz3WvIqFXWCOtfQcvBmXus12E2gl15m0HJbD+TRwQhVgv9iZazjgg6Hzz45RUevX2Frv4Z3nSHOJsB0EmhLGSY2uE1rC5Fgu2FLGMsc52KG0MCTMYtaQ7zdpW0tXgJgJ+WevFMYYFUI/U8YnwpXiheTUX6CIOocGfDUt67UzFcAevgDdTqefDq6YRwg2U0dhZ6KaknD+iexYOah+Y8H31ZPbdbGWg== 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=O6u6sPE2HZSVk9t3KGS3iE9yURMQvASLhwWStL4o8OA=; b=ad3khcK75ILJMtFIJoFJBLwr3+BBms2gNnFMPVy9SnVbzdjSsZYyMMi52gHOCJmw21n0JWq3JrpuKBAN5qNva/Stv865XyvZRLcQbEMYxkABeqPzjg92V+1VJ9N4K4YqdWk8ho1RO+O0u99x6NcmonKTqFMx3HVXe0DQyiajcRSzWV12d/ArW2hUXQjkAAVZ7KROz1je/BPtqImIc95MpM+YHL/Sxt1jC951l0bkiFtVTAVrGVGtLJ9Vutnad9JCE7mVpimZX2sz69aplWioBcU9+4fbJnDCaubzQgTqet1S963PnkuW8w+1HCbJ6B9RPtmtaUU10FPGb2yRXvS6fQ== Received: from PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:f7::14) by MA0PR01MB5697.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:6c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.22; Fri, 7 Mar 2025 12:00:06 +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.8511.019; Fri, 7 Mar 2025 12:00:06 +0000 From: Aditya Garg To: Jiri Kosina , Jiri Kosina , "jkosina@suse.cz" , Benjamin Tissoires , "bentiss@kernel.org" CC: Grigorii Sokolik , Linux Kernel Mailing List , "linux-input@vger.kernel.org" Subject: [PATCH v2 4/4] HID: hid-apple: Apple Magic Keyboard a3118 USB-C support Thread-Topic: [PATCH v2 4/4] HID: hid-apple: Apple Magic Keyboard a3118 USB-C support Thread-Index: AQHbj1h3lz5O14VG10G9npfz0dlWVw== Date: Fri, 7 Mar 2025 12:00:06 +0000 Message-ID: <0C3B8412-20CD-4523-A794-AFAB6D6471BA@live.com> References: In-Reply-To: Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PN3PR01MB9597:EE_|MA0PR01MB5697:EE_ x-ms-office365-filtering-correlation-id: 2e1a76ba-147d-4da8-e69a-08dd5d6f9a59 x-microsoft-antispam: BCL:0;ARA:14566002|7092599003|19110799003|8060799006|15080799006|461199028|8062599003|102099032|440099028|3412199025; x-microsoft-antispam-message-info: bzASQcaZvSwrJCHWbPhs68AI+PcXgNvjPfdNapNij6N2JFj2hoLLwaZF1iqGONGYw76S8jql79wHlh4CeMHtrnFcjOV0tNEsfmZmmt8zBi+LnB3p4SuvqADQjqn2YSMCwZVuAZY1yqGD1h49nxgm10WoOd47OKkYG9tkDW10FekzRKuWpJ/XZk4gozodTaCEsuYjiqNLy52n57AVAzLjdkhR1cgV3ig9alT1QnGcOyDktpYLvq58/opI8Pjx7JfW18FJEh7kb9eimDeNp/YLy/6pDH65K5W/KlC9sF9hIxZPZlhqEjUAoK5JPnNWa0PFy0aGgW5cz82b3rsh43WcSROT0q2WNnwYXQiF2qokrr8PninFLe8Z8SvP4zxZeXDy9RhmTjg5j4tumchEi2Ro23EwUF/QOid8Sj+jvoLojBlfEzypGUet2BlFYHcUmj72HGSGkV81Wm/a8LwFMOQxQBKLp+KSarJ/dBu8oyy+OdqChJ6X9u5pocBp8WHi0WfGi7ltaY5zpxtMwDFNj0dXuW3lcMuzuE0vcGSlv9U2Imn1DT9AXYAJ8TNKWuG3RdjiPPQUC4cmQBz9SwEpUNvvSfYL6QaUGuMtvWo2W7tTBXS2Por2oLfvOYHVR6uXotG/w333ECecF9ErfTLsMSwCwxI4PgW/z6tsW5vAvEZUc5VznpSAKksl//ZyXWGuz0DdiTH7jdTaloVoyZo7BpJkHm/PnLTavo9TV0pJ+WmnQuL4kJHfKnF/O9UVyhDGYDa73B3+poag2tt8Dfi41TZ6QB/oa5bQjGuKXIqvo20vsP04bcni6BMjoJR6U9OriIAP6ao32YI5+Tk1aOqG/VjFrwNIc6yBjjZkbDmLAwmzOrkLropvDziOaEtFZ5Y0Ipsk4xpuOElHzcuhtIEjm12ED3TCsOxnZGOvGaSdUC9GaROnh16Nvgs0tIjYzZ0ec2spS57ZWLi5qoeERQDYI1X4naC3jTwcM/7Id9S5JHULGxZiVCjiASy28TvKx92fRbQ5oGSGDGgyG4re/3DU5OnOWLNPrmzhei9x75EglQy/aLwsnS6w54sSqwiXFOFoiVE/K0uVgmnq5X7tmxBP7P9T4g== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: LXDZaXn15/497nNz4UPaemXNFADRIRNPTvsr14miqgigmtxlbCAL1+Xz2wzatd7jmqVQ8th8kMNtSIrp9J4r22a5rq6fdnOrL12JvPj66T96ISgbvSoQn11qubOjxOax5KvcTzKlbYqc1wqrSrHPvjI+tHZxIeWepoj6fnMvhWX3DmU7yJPsgqbOTF5AVNAIm1ZZCkzSFM2xrxQrDQ+wCbLKHfSyN2ITmtMc6bG5GR1sil+BwQrh7p6KtqgHX6UWECOsvNI33Uez2PR72eTgmdFeID0uSt/TcM0r7e+bxGbVbqHrgTeyKIzjGQxjRbB8j3Wa/hIcnXFS1fg/bT3rZfhMnyVpP0A0bbOjWB1osadj7CaLcdPFNrZRI3KhwzVSkPq5tXPWfN4diTom8FCbokCkUZjsPt0xBLLdxkjd7cwxss2Wq0YK01hLnx1RqWTvtKCbVaVvRcdY2toOmJI6UU3viudmCE049N4YSSUJFCAyb2XpJUYXC73eScWWHhOXUXWyEHk2ylvjHf8ldz6ty7LOGVmw+wViq/I/XOJg9mc789n5xeGBNjOarCJwaDf09NXL5fyrSZiTwFWUqGZoaSOdkOdvwtwqBfRNLSxRq3XViAVsED1J8IBmPeB6GR5BOzOk3f7bHop4QSzC0cL1xy54jcXRAR/ZTYMfr0dND8aRAjUpXP41uZPL7bxD2DGN5XzujtVsAedxteBqIdgnJHAoZ00ZrTW74txjMZkYcj970Joe+ma70MM76C01x+fbxgcoXzO31nxIUWPsevYF0A3PnlRAabKyEcXHS5/yaV7FWeWWVR2he+dNBa3+UuwdGKCZmFHyaoN8GjLgXuivTHYCLtHZb3JqEvaofZOcp0lXjff+ktbM72SAFlWLif8XuykRtJ0DvEm0EH91quz9b8Ut0Zg3rpu6uVTxi3oOWQiCo9P6FI2dz8uflKFKv7se/dEzGLbTy3kWFhXwXAWxqd/N0p88u6DXa5eLKxLjET6oLaugMK04z2jGilj7KXIZU+Y/xkp/zhcWyDaLB5SndTArNLNiDvYp4Oc75n2l2rzJ76e72yfsYaXHS9rI+BpqNqouIq1ave4h9siyNoPVhI1Wb6gl/8mm9Wuh2sxdI4Rbxco9eulWI2W21N+5uzEqrNyvTnoQiZcbswonAzHpZRrO7qoJiEfAdFqr6P5xm0Ug0cH/H2IA49RBn7Szm8dEM4cIvm8HWrZMqirMLDkF4Wu/9TWv9hHgFXqXT9IEmu1ZAJ6/0yylIe71FFt3wkHtPxbOnWWhAIt8q5tqkSY65A/NBsy65LfaUcGSPNXxsV9//y+FjGLT8nCggyPYF7i5 Content-ID: <4F83D42887743D4B8E8C36D25CCA1704@INDPRD01.PROD.OUTLOOK.COM> 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-20-msonline-outlook-ae5c4.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 2e1a76ba-147d-4da8-e69a-08dd5d6f9a59 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Mar 2025 12:00:06.8587 (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: MA0PR01MB5697 From: Grigorii Sokolik Add Apple Magic Keyboard 2024 model (with USB-C port) device ID (0321) to those recognized by the hid-apple driver. Keyboard is otherwise compatible with the existing implementation for its earlier 2021 model. Signed-off-by: Grigorii Sokolik Co-developed-by: Aditya Garg Signed-off-by: Aditya Garg --- drivers/hid/hid-apple.c | 21 +++++++++++++-------- drivers/hid/hid-ids.h | 9 +++++---- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index fde438bee..e95a54113 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -165,7 +165,7 @@ static const struct apple_key_translation magic_keyboard_2015_fn_keys[] = { { } }; -static const struct apple_key_translation apple2021_fn_keys[] = { +static const struct apple_key_translation magic_keyboard_2021_and_2024_fn_keys[] = { { KEY_BACKSPACE, KEY_DELETE }, { KEY_ENTER, KEY_INSERT }, { KEY_F1, KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY }, @@ -482,10 +482,11 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, table = magic_keyboard_2015_fn_keys; break; case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021: - case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024: case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021: case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021: - table = apple2021_fn_keys; + case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024: + case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2024: + table = magic_keyboard_2021_and_2024_fn_keys; break; case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132: case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J213: @@ -690,7 +691,7 @@ static void apple_setup_input(struct input_dev *input) apple_setup_key_translation(input, apple_iso_keyboard); apple_setup_key_translation(input, magic_keyboard_alu_fn_keys); apple_setup_key_translation(input, magic_keyboard_2015_fn_keys); - apple_setup_key_translation(input, apple2021_fn_keys); + apple_setup_key_translation(input, magic_keyboard_2021_and_2024_fn_keys); apple_setup_key_translation(input, macbookpro_no_esc_fn_keys); apple_setup_key_translation(input, macbookpro_dedicated_esc_fn_keys); } @@ -1165,10 +1166,6 @@ 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_2021), .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, - { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_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_2024), - .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021), .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_2021), @@ -1177,6 +1174,14 @@ 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_NUMPAD_2021), .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_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_2024), + .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_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_FINGERPRINT_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 288a2b864..8682e1b11 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -162,6 +162,11 @@ #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS 0x0257 #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2015 0x0267 #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2015 0x026c +#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021 0x029c +#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021 0x029a +#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_WELLSPRING8_ANSI 0x0290 #define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO 0x0291 #define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS 0x0292 @@ -183,10 +188,6 @@ #define USB_DEVICE_ID_APPLE_IRCONTROL3 0x8241 #define USB_DEVICE_ID_APPLE_IRCONTROL4 0x8242 #define USB_DEVICE_ID_APPLE_IRCONTROL5 0x8243 -#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021 0x029c -#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024 0x0320 -#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021 0x029a -#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021 0x029f #define USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT 0x8102 #define USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY 0x8302