From patchwork Tue Mar 25 11:05:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 876195 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6DD082566EE; Tue, 25 Mar 2025 11:08:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742900893; cv=none; b=LysOdEASwBRkuDk17A7M+XHBKiAoWG3TmlPLxZznyF8MAQMo0oKhygjv4QiuAw6LxuH7V/sFPseQ/j+Axzzd+kWI5o3bX151PuZky4L3HHVi8tXz7e+/Vy9norXxIY6TzZd68IvcPMjv5wdJ/UU5gsfSDehEIGlgzGiw9gYGaTE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742900893; c=relaxed/simple; bh=Dw+fYQ8ICtK3GHaI2BfzIfiP6RgOGIwBHKH8+SCDsPM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rwBHGkFQi1B9bQ7MtzJkSFpuHiAKzDv+ZlRHtZ8omTXuyCDUTsX1iK9cwqo2TcsrEj7kNGR2SRbUKuhiWKE2fJpb2oBmVZl5hc3Ctg6zRN1NXgQgXhwmc6O0LBPI0kdvi/tqwLlbwZB0XTtYFgKUGabzC36sxuQdZ7AshUnguIo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lY1mCGKl; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lY1mCGKl" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-224100e9a5cso104343255ad.2; Tue, 25 Mar 2025 04:08:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742900891; x=1743505691; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OsDB8xid94rpoG1NCkWeFF6azdqml4lQDa8tqLtmM+0=; b=lY1mCGKl2k6/JamtDX5KxzPzl2NrVcDRBAGA7F58VtJ05P8eR+NSbiLhM3JDBU4EWU 0L2+1wekue5jXyW5CaoNT/SrDT3V+A6KGBi09SLM/BwPh/ZQL8TgHcI2veo0otko+pxz y73x8QrtbRN+LPs7yBeDQZB4ctMixmWTkPm/vTtb/aZqpi7AdsihiOcB7e4UqUhpfsl0 ATQMNlCsWU1PL9157wCbeYQyx6sV41ZSrn9+HXMJFIWuL0TaSAZvev/kRFSXNFQpFLYX uRiN21R5Vp7l0peB9F4NmGwBQ44Ltc1m3AFkaXkLhOYSsMdceISyuWtVBg2z1nfP43jJ Se5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742900891; x=1743505691; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OsDB8xid94rpoG1NCkWeFF6azdqml4lQDa8tqLtmM+0=; b=CEH1sGRSffrG3Pt7GEA+XFHeF6Ve6RUYCvV9jWXZOvyvoLQXqd19NaxfZxN9iSb+BW rZ9qRkYbRhZBNnMCM/kWW3QTZOrKJtxWjhrEBSc7qHi3E6r7E3xKgBwvpe4DijGsKrLf namfA92EQqVIhlTmu5N+bOFVu2B3If6dOJmnwodztGVZZ2vlwlgjphVWDEuYk/ORdXmW o+r6Spo2lOTvAA52ZGmvPczpGvm3bCAZIrpZMG8ebjpeh+fywWBR/Oz7lO+1HKIYmCy0 IfaRm66TACDpXDlzsDM1bfBz/udh7Nnh2/1wkd3ZFza5B0HuqJdsIjPX5NRi1iCHqjFQ zerQ== X-Forwarded-Encrypted: i=1; AJvYcCVsZmUk/HPB32oZ7DhfWDrWHcE8QayXYlwpPTiK0XLLR3bC2RTu/T8IweoEeTaVQr72jwWc1pvfiVnxDncE@vger.kernel.org, AJvYcCXKkzh37J5ItOaYZGR+L4iJNmy4tP7xTAc1SjBkdrn3yU3WSreX2b9So5HkrnySgl9UJ6QwBYOBGXfFZA==@vger.kernel.org X-Gm-Message-State: AOJu0YzZ7foQ+Oukpc1EA8JjrFWTZdoQ7m9SeA+0gq6lbacsdQ6nihef 9v7FWz35MgkCxt/3nhT5ix7IDRggpL46nqA27GVn493HZFhG3dLI X-Gm-Gg: ASbGncts9u3cqAeXlIneFisQW8Jt/Pg+zAaA+++XMEG9lcHC8UvxLFalL+LXZKPeSEc NHW1HGO3z3iv/koVhNWVTeCH+ShHhqnH1R87olxcRzSvqL4G6Y3/tCtkwl0cC6lhI0ClNTkzF21 ghA230mPcurjBpScHTFLmECYTZSGaNXsnb+wIrw5Oi6NXq5awfS3aA4ZmDFCnizqWc2gLe0dQR7 CburBjF71/l2lWJ+XW4JjBlBpex+RXwozAfChpkKVtpeW66n7Iqbbh363GRolpjX81iY6iwx7dd EAiYOGCFZfO4Ipy2ViFDLK57EQnyTFX2mfwstlCr+36uAQZjtqHR33LZ39ypxMnRR7Ox+a1T+sx cAaBdmUoKVuIm8YlfSQb6jv/MybBYMxX8oPns2nVjHI7iww== X-Google-Smtp-Source: AGHT+IHc+ZII8EOEW0S7Jo/xArzooNn8yY9wrMSuWQcSDMAJuNffQ/NnlM6qPF04UZDE1TJnzwjsbw== X-Received: by 2002:a05:6a00:14c4:b0:737:6d4b:f5f8 with SMTP id d2e1a72fcca58-73905a3b2dbmr19516295b3a.17.1742900891370; Tue, 25 Mar 2025 04:08:11 -0700 (PDT) Received: from codespaces-3dd663.dxrpqgqhlb3ehogrxrezr215ye.rx.internal.cloudapp.net ([20.192.21.54]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-739061592b9sm9787667b3a.152.2025.03.25.04.08.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 04:08:11 -0700 (PDT) From: Aditya Garg X-Google-Original-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, gargaditya08@live.com Subject: [PATCH v3 1/5] HID: apple: move backlight report structs to other backlight structs Date: Tue, 25 Mar 2025 11:05:23 +0000 Message-ID: <20250325110754.28359-2-gargaditya08@live.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250325110754.28359-1-gargaditya08@live.com> References: <20250325110754.28359-1-gargaditya08@live.com> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 Tue Mar 25 11:05:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 876194 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D731B2566EE; Tue, 25 Mar 2025 11:08:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742900899; cv=none; b=BPopCmtS/mYRu/ogV9cnQAeJh1fRRNwytfBvbUt+6NW7fhHV3oY7szC2UlNnSnGhcGNVYIFBfH5B+m5+7koNJAPrTujV9lKaMPGU6dZtPFQfpLkdxG5L/1GZj1Dx5EwVQih7OsfP13urChFGU9aeYRwti8XR9xeFuGTY/XWBK8Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742900899; c=relaxed/simple; bh=wsf6HQ3e9ANkj1wavedwTlk4WkJIb+tXkAOYeXEKyrU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eEzXM+ehWiYvG1eoa3h8gBdnVtNbbAbWfOIo2WzEjSZkqxkX92DvaJivJgZw3yNRFS7hxAzutBUaHcNV42l05jOpH8Uo5GZ3hm68+kBiw7ZoHJAlI0tCLZawK6ZDgFNzwMtmo04bgZSvCjwi6EotaAaVLpdkN+/r5Sx8JZJQBCk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=E/DFD+DE; arc=none smtp.client-ip=209.85.214.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="E/DFD+DE" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-223fb0f619dso108476435ad.1; Tue, 25 Mar 2025 04:08:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742900897; x=1743505697; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YhivfD4EuQErtuhsFEEmuwqN+9F7EVr8Uz1K/b/I6E8=; b=E/DFD+DEAPKOkiS82slgQn241YEvKDvsPUwRNMMVkvYxrhu9merHBKlp9NAwbVIYKp kAePGrJ21p8mHdeKrutoURZ5WUP/GF493/lOsn0z4bMGONgPrgQo2owL+d1oQJgDvXJB uNa7ZH7z1R4izXSGmqUDl50b/RFeyl/SlxJVbE1r7iTm5J94D+97C5y89+HfuycSjOaK n4s3zWbGfrjtUJmbtv3IhlllizhTn7A7AV4RXi7/fQWvt8ZJmHqDwH3FHO7RnBOlGQ7Q PpvqD98aC3qmoegXlOvpXduKIHAwLsyq19SwrncnofaM595vwq+cIA5USJTjykvrTTfE bcxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742900897; x=1743505697; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YhivfD4EuQErtuhsFEEmuwqN+9F7EVr8Uz1K/b/I6E8=; b=ljBATaRYsoDIZa8B58ekNTYrZSRnTxrI+bm//6ElCucThkSof+dgqA2PsLtSsFS5jy XBWFYzWPDMz0KWYirwxHS6SexeY89BcVb5yaIvazOPJd5wEvZCGQ/Bc3tmej35W1tzRp 1eiF08VdxuXdqxel7QajIQBaEYPH8fka1Njk6yFdbldSfwhH0E/E9n7AyEXOpTQSdNNP boHtq7mObVhPUbGtlSavIlsKQil0kXAG4Q9XNFN7flF6miLD+6GzaFHuH4LEBqUl4jll nC5txPbdyeKGD/I7uLiUnOIavdBm1h1jWfkUrC3tbiVeS8ivqvExIDM3VEQJk+j5RU5m 2+rg== X-Forwarded-Encrypted: i=1; AJvYcCViEnWX9uSfDn09RX4VLMTo+UYxXLBJZwtmcJaHKAsZBF0Y0MpBETQzSAXqpG+CbFZXNRBht78i3gtw8g==@vger.kernel.org, AJvYcCX6ReV24Xt5EuGrJBdJF+tfn3RtaqZisUhGKqcv0hjS5OQfcWmDh6kN3IRBClGvdIBpx3f9uBh1lMOPLSDw@vger.kernel.org X-Gm-Message-State: AOJu0YwNeYCMCqoyPspgGDkdRdiftgc9FsZ9JUEMbayUYGREiyBD+yhZ SPJf9LW5t5n7BEkSl4P52A/LEDvwoQFVXU6BwecQnUhOwXbtZ36q1Zfm4E2tSyg= X-Gm-Gg: ASbGncugnWK0ziOZCV8LLkB+EM5uqZH91k5uh42v4Uo5gulUm5HA2OybqVBLWizVeKW h5AYLIMM8mS6zvN2YV5tD9+YvqkPz94PPkDpZ7S6jUvuJvox/Eq3UJMXjfoHpqWj6XUtnMjVdV3 nm1wtaFWg8gIYhyLIPiiMOlhJKSZpYUR76VT9Id+CwenUumiYXvNa6z04zKxlAih1hbeWLLmTy6 rUB5zQWokTWAxVX0KTC/8gIBpD1ccCx5/S4CPlSC9WUy+3JJTsmoF7TLBWZXzIT8HcWHbqEbZg7 0CKVsGc/Xp0bF6wfr76G39QyW1sZF+4Zy+jJmu1Ay7voRT4MaI+sxR1TkPXe9W/E0hXyXvhWVmI qH4wDOzN/ez90J1RB52V/dKlzIaceOg6g8GMUcukl8FSu0A== X-Google-Smtp-Source: AGHT+IFAEj5uu/zcfGHVZlAFWlin3o60E9QxXNcBZxqcl7bVTv1Q5Kvgnkidn6vc4i6BPtUSjE2DPw== X-Received: by 2002:a17:903:22c7:b0:224:2717:798d with SMTP id d9443c01a7336-22780e44079mr243169665ad.50.1742900896945; Tue, 25 Mar 2025 04:08:16 -0700 (PDT) Received: from codespaces-3dd663.dxrpqgqhlb3ehogrxrezr215ye.rx.internal.cloudapp.net ([20.192.21.54]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-739061592b9sm9787667b3a.152.2025.03.25.04.08.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 04:08:16 -0700 (PDT) From: Aditya Garg X-Google-Original-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, gargaditya08@live.com Subject: [PATCH v3 3/5] HID: apple: remove unused APPLE_IGNORE_MOUSE quirk Date: Tue, 25 Mar 2025 11:05:25 +0000 Message-ID: <20250325110754.28359-4-gargaditya08@live.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250325110754.28359-1-gargaditya08@live.com> References: <20250325110754.28359-1-gargaditya08@live.com> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 Tue Mar 25 11:05:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 876193 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 74D862566EE; Tue, 25 Mar 2025 11:08:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742900904; cv=none; b=UtlPDsJGf/Y2yvG1RRE9iDAsLs6r86Jxi678f20KYcAdJqeDxJaf577A/aT7+8lYzabYBGPsfa0WBpnQ1xxIpV1EIuKDmAf1/+3j5tdJalyjZmjfWmpszechYZUbbQKxn5mjYWytPVwvqcHu/qWY6RUj9OQfmbGlGJQBqe4AMPY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742900904; c=relaxed/simple; bh=LyZ7Ds1GgfPH7txnaX5X2SHpowwbn5FMPsKuuSF1ER4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TmCHODXnvIZ9ubiikaGzIFJmOlrzV6rCjbP6ITO0ktIiRvCHBvWbdQCNtrh+13kqq4iQQHyKxf3n8vJysAyCrXBUWZY8jSn6CnvEjmNOJQ3IKONu55KfTLOu6jP5ZLChB3J+vS1+nGYGT9kOpKh+W34svfu6Yvt4ZPKLNTtQelg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Huoc6BXr; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Huoc6BXr" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2240b4de12bso36319535ad.2; Tue, 25 Mar 2025 04:08:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742900903; x=1743505703; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2gkQtA6BSk/mRKzla3JHVlyl9UsPkc1mDthDlBu+rnk=; b=Huoc6BXr8IBgckIteEyUYX4gu8UEebt7N/xZMmoDekix1f3oouKfJg5NSTkI8AShNT bIVoQHfDDcdz/jlbQnLYtDPzhrRrozQjjnkDB+u39+u+EGypdjaU49SdyTcL35RD2cGD ynOGN9SQ6zYnMbTmnaySfjasOn/B9P+nH4UdX/mWkLDvMfeArTuD+1TTMGywLQpZjo3q hXZrEchDCHSrkduy0t4ZVSfK7rndSCDRLPfpuUX5Q0ML5JYSY1phldVj1CM3n/CqyXDN M+25ZNwcUKWCcOklQLMn7ILV3lW0xis60lAtW/gLDc1lEALyw51CHFqCM6rl+EBBhi3L bAxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742900903; x=1743505703; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2gkQtA6BSk/mRKzla3JHVlyl9UsPkc1mDthDlBu+rnk=; b=a3W6xnYqduKKrEV3UgDv+ygTZ11NWBCmmcmED/p/Qnw6DwAmx6EzqQWdnqnrwrf7IM bsR0GIKgjhpJnv2DZqr1b+ZOP1ZmpkgE7+MnmPoy1dSh5ajAZSkrsdiEPepVjfYuzXBU giPSgsJDDsLTGYeQDLc9HiDlmFdYdsZME7G3IQQvURoQEFVwQHmO6y0VOmalwCCIkj5f u+DWILx/NUWgpWCPciM8eeM0Da7f/XJy2NlyObq2cq7gJp99IgTRkLxhmm4EaZdy0wj+ h5ahOUq6T+ZDwmtOfnU+OM4JOtm9iWw9PSo1LJl+p+UlTGz2wrKhB2lnYTByhmoeUSk8 Mttg== X-Forwarded-Encrypted: i=1; AJvYcCWt7Wf7CKvk+XBDNt+b2crq2ionuYLxcFKgUr4wQkGYSEvuM1vum9cZlXMm44LM8bKO8nouad9uXFVUg2yp@vger.kernel.org, AJvYcCXpE2enKSHGDgjvTiS0xQvM3QJJM3OWZg+ImYd85hjOuvZyqwWgvehV/ZD5njgI++yQAIwfolwwKW4C8w==@vger.kernel.org X-Gm-Message-State: AOJu0YwD956Hd+OQtT3d2Y3GyNoqvLbpJ3Pxdpj0MaG+YF586xNnWsBG M4id9MMN/lG6fSEeqBOxJ8OsKqi4uXzzgu7Vp2FndMqFOf8duRmGuaIA6Mu0SFA= X-Gm-Gg: ASbGnctHL3WHfdXE9aRp6I7crosyHvlmeUosyOVFAxMV4SZJ4Em21IBQlITSquAisag oOgbT1pghgaqefjETTfp+C1o4cq5zPSY2OK/1cIx9FyLF+jxKiO2kA5F+rUqzGrXSQbfQlDWCT+ AOJ01G1MLTEQIgrVgM7kKkXmlinu4d0U2gBOkVyvxpZ5h4qx5cldyv4d+dBQxtfRBF9kkrE4f4H 7xo+9GW4ySPFaUaaEOtiLjiYghQDtxlsyKl4Bf7zkJcUVZXsRd6j27delNeXrxYmiEJOeMTcNPQ MOjTGIB89Q2sQo3yW0vjwNCDPDaBgXaum6Om4WAmqf980WowLZvFgA1VpxErUB+DKEXUGdptCBW GoYlavvSbS7s8fR7BOxkSzuYuOqG2tQi5988+OTSQXdgOHA== X-Google-Smtp-Source: AGHT+IGa9t3IskA+J5tIjYqnIplK5sNodQOqUyNl7PVOst5jRQcbIW5LxLkL3kvVXHugMBvVHuxNWg== X-Received: by 2002:a17:902:cf07:b0:224:1234:5a3b with SMTP id d9443c01a7336-22780e31515mr248484255ad.51.1742900902551; Tue, 25 Mar 2025 04:08:22 -0700 (PDT) Received: from codespaces-3dd663.dxrpqgqhlb3ehogrxrezr215ye.rx.internal.cloudapp.net ([20.192.21.54]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-739061592b9sm9787667b3a.152.2025.03.25.04.08.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 04:08:22 -0700 (PDT) From: Aditya Garg X-Google-Original-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, gargaditya08@live.com Subject: [PATCH v3 5/5] HID: apple: Add Apple Magic Keyboard A3119 USB-C support Date: Tue, 25 Mar 2025 11:05:27 +0000 Message-ID: <20250325110754.28359-6-gargaditya08@live.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250325110754.28359-1-gargaditya08@live.com> References: <20250325110754.28359-1-gargaditya08@live.com> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 7f2976639..88925cb13 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