From patchwork Thu Dec 2 06:16:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Henrie X-Patchwork-Id: 519966 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5062FC433F5 for ; Thu, 2 Dec 2021 06:17:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234416AbhLBGUy (ORCPT ); Thu, 2 Dec 2021 01:20:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232824AbhLBGUx (ORCPT ); Thu, 2 Dec 2021 01:20:53 -0500 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59B3AC061574 for ; Wed, 1 Dec 2021 22:17:30 -0800 (PST) Received: by mail-pg1-x529.google.com with SMTP id q16so26015771pgq.10 for ; Wed, 01 Dec 2021 22:17:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GajwMokPHBEeO5qEyHkNbV2lIovNdl91vvLNoj3avsk=; b=kgrkjbjbcCR/cypm1MofXVbS2paiAHVVHTkhGDmdMBp8ldRyfe2Ix5IJ2cUyzUSFVO KCMjMEPGnBqcZ96TY76rlkKrGYKBcvPQ7UGnpW9XYEeTVmLKOL+tM3uJT4mK1uWC0z0p 4Pha/J1WCUmvpmaVaH5fykUnv+mboTifXDTwjTIGT56lt64EagaAMnBan+hbxStImGoy T05k03IDaGa++mibRIPOMj6x8sjAe4+6wXMs7Ni5gnNh3orWZhAoC5htgduYI370dq9T lxNlUC1xOGUQkgweF5KZ6+hT/isOybXr5Cj+Xnl0qIN3XatJ0I+7D+XX3YGfzdDVD/A0 gm4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GajwMokPHBEeO5qEyHkNbV2lIovNdl91vvLNoj3avsk=; b=VB75qVhhzxoUXP7b3ly7Vxa6rn9ujehq2IwwAmawUy76aGfzkE5lOqRBHIlpG/Iwvz UOUaaRkD+/3NYXgJXN2GPvYyY5VlVI3XIxCNVOdq9MrqQx58W+DeNTJRTnGftTJsWW4t /duakx4u5z9SYCHq3jpIMtVyzajl3BHtQNoQTaMlrj/rSAmJ7r4Ac5uueocVUuWpN+OM /jwu3BsqfVpGj1T1YyDNB4TXE4LHR6qQpLkibeJWo6tTRIYe7fkJ14GfDnUFFUJvQ1CC tX070SmvE6BzEHu69S+miv4rWSauEb+U+eQMFkvD/u7npMrqGYkcOBjs+B1mKRMzQdEc rnGg== X-Gm-Message-State: AOAM532vphqeLsP8S/cxRc98mRHI/XsfIk3M6dkenB+EpVY1T3T8XYOO 8jk1ahgim19erz+60MZ7y3UzD5QwHfY= X-Google-Smtp-Source: ABdhPJx+w9kQ0w2bbZwjEfOf4N2ItKZ6Gc1EWvD0VcWKVzR+vphksiPhkK4Av8n4WUh03PgXSojBQA== X-Received: by 2002:a63:755b:: with SMTP id f27mr8146165pgn.321.1638425849488; Wed, 01 Dec 2021 22:17:29 -0800 (PST) Received: from xavier.lan ([166.70.246.164]) by smtp.gmail.com with ESMTPSA id x33sm1663763pfh.133.2021.12.01.22.17.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Dec 2021 22:17:28 -0800 (PST) From: Alex Henrie To: linux-input@vger.kernel.org, jikos@kernel.org, benjamin@sipsolutions.net, bberg@redhat.com, jose.exposito89@gmail.com Cc: Alex Henrie Subject: [PATCH 1/2] HID: apple: Add 2021 Magic Keyboard with fingerprint reader Date: Wed, 1 Dec 2021 23:16:50 -0700 Message-Id: <20211202061651.115548-1-alexhenrie24@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Signed-off-by: Alex Henrie --- drivers/hid/hid-apple.c | 4 ++++ drivers/hid/hid-ids.h | 1 + drivers/hid/hid-quirks.c | 1 + 3 files changed, 6 insertions(+) diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index 2c9c5faa74a9..b2d8bcd86bd5 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -640,6 +640,10 @@ static const struct hid_device_id apple_devices[] = { .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, { 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_FINGERPRINT_2021), + .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, + { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021), + .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, { } }; diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 96a455921c67..8c70a731ef46 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -175,6 +175,7 @@ #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_FINGERPRINT_2021 0x029a #define USB_VENDOR_ID_ASUS 0x0486 #define USB_DEVICE_ID_ASUS_T91MT 0x0185 diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c index 06b7908c874c..319bbae7ff62 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -303,6 +303,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021) }, #endif #if IS_ENABLED(CONFIG_HID_APPLEIR) { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL) }, From patchwork Thu Dec 2 06:16:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Henrie X-Patchwork-Id: 520855 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DFA01C433EF for ; Thu, 2 Dec 2021 06:17:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232824AbhLBGUz (ORCPT ); Thu, 2 Dec 2021 01:20:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234329AbhLBGUy (ORCPT ); Thu, 2 Dec 2021 01:20:54 -0500 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EC21C061748 for ; Wed, 1 Dec 2021 22:17:31 -0800 (PST) Received: by mail-pj1-x102b.google.com with SMTP id nn15-20020a17090b38cf00b001ac7dd5d40cso3781707pjb.3 for ; Wed, 01 Dec 2021 22:17:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Csl63fRf1TquKhILndInZ4fFylaHk+NhQgJgwRqhuTI=; b=R/5jpbCFDHhYKUwXyRXqAn3Y02+uYCNSTUG3+c38Z4X7IMOB5MOPBPv4UfhAQPfp2B LXeluFNVoyLBPS9L4LgP1CUmwr1/snaR/20j0x5f4NvBTzE99CQhcOPnM57hYhCxQlsI Q22ky2XTUY7CdIptbbWRvj8/1fR1WQBzHI5A0JowoDtBpgva+zwoj9YfRNwYSP6+KjKd h9ztv0F8RtT5ICcuti5+FllJhDPuCUw/W3nY3sotFC8MPmhRbXy+fcSpX3lS5cVKGynH kGvSskbuU2qoExNYtKU6win8jGg0si0dmXa6SiAcC/q1Qm3z3MCBfNUxjYy/G39izqg3 jsBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Csl63fRf1TquKhILndInZ4fFylaHk+NhQgJgwRqhuTI=; b=P4yOtEMxFLjpzBdPgE7D34opR35egt8pcY+W+jxBo8j6tj4b5rcOxu5KWxsgr5R8ST wgQiXhPAXILLqbwAEfrpKMMF9cLC7+MqiP1Tt1SvXpCB8Bt48yV+lTFmsSjJR+neJcPu 2cFaEzf5ptznNGupOWAoyrZiFrosEvWVQHa3bjl+xofrTRTHs2yIPlPaPCOjs1U5RIAp E0b/bQh634beuq+DECGluEcOigx5+7ulJl5u+jJUhzWSfyxleXFGMMTugQtK1e8JvDfr B2CGA6X2BPqgLfT6s0zLIKSFyASF0ltef47XvXfZk8HXGpuaGLMNsdz7tBG7YbnpXEBD aFQA== X-Gm-Message-State: AOAM532y1YOWEep3lncSq4yBxbB9vDye3P9i2vqsxmOEe67HEbZzrCa7 WtGf47Os4R4rZy2PvO6mFZxdMpM1UTw= X-Google-Smtp-Source: ABdhPJwVNJqAFvVc925j2mXEbq/ReJsycdHYN9QtLv/BV3TbeJp9mKebVZbuf961al1fLOZT89Vn2g== X-Received: by 2002:a17:90a:c286:: with SMTP id f6mr3781183pjt.45.1638425850663; Wed, 01 Dec 2021 22:17:30 -0800 (PST) Received: from xavier.lan ([166.70.246.164]) by smtp.gmail.com with ESMTPSA id x33sm1663763pfh.133.2021.12.01.22.17.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Dec 2021 22:17:30 -0800 (PST) From: Alex Henrie To: linux-input@vger.kernel.org, jikos@kernel.org, benjamin@sipsolutions.net, bberg@redhat.com, jose.exposito89@gmail.com Cc: Alex Henrie Subject: [PATCH 2/2] HID: apple: Add 2021 Magic Keyboard with number pad Date: Wed, 1 Dec 2021 23:16:51 -0700 Message-Id: <20211202061651.115548-2-alexhenrie24@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211202061651.115548-1-alexhenrie24@gmail.com> References: <20211202061651.115548-1-alexhenrie24@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Signed-off-by: Alex Henrie --- drivers/hid/hid-apple.c | 4 ++++ drivers/hid/hid-ids.h | 1 + 2 files changed, 5 insertions(+) diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index b2d8bcd86bd5..5eda7a0d0575 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -644,6 +644,10 @@ static const struct hid_device_id apple_devices[] = { .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021), .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021), + .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, + { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021), + .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, { } }; diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 8c70a731ef46..16fbcdab2ae2 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -176,6 +176,7 @@ #define USB_DEVICE_ID_APPLE_IRCONTROL5 0x8243 #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_VENDOR_ID_ASUS 0x0486 #define USB_DEVICE_ID_ASUS_T91MT 0x0185