From: Antheas Kapenekakis <lkml@antheas.dev>
To: platform-driver-x86@vger.kernel.org, linux-input@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, "Jiri Kosina" <jikos@kernel.org>,
"Benjamin Tissoires" <bentiss@kernel.org>,
"Corentin Chary" <corentin.chary@gmail.com>,
"Luke D . Jones" <luke@ljones.dev>,
"Hans de Goede" <hdegoede@redhat.com>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Antheas Kapenekakis" <lkml@antheas.dev>
Subject: [PATCH v5 11/11] HID: asus: initialize LED endpoint early for old NKEY keyboards
Date: Tue, 25 Mar 2025 19:46:00 +0100 [thread overview]
Message-ID: <20250325184601.10990-12-lkml@antheas.dev> (raw)
In-Reply-To: <20250325184601.10990-1-lkml@antheas.dev>
These keyboards have always had initialization in the kernel for 0x5d.
At this point, it is hard to verify again and we risk regressions by
removing this. Therefore, initialize with 0x5d, and skip RGB
initialization if that is enabled.
Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev>
---
drivers/hid/hid-asus.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
index fa8ec237efe26..d02d0629d03cd 100644
--- a/drivers/hid/hid-asus.c
+++ b/drivers/hid/hid-asus.c
@@ -90,6 +90,7 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad");
#define QUIRK_ROG_CLAYMORE_II_KEYBOARD BIT(12)
#define QUIRK_HANDLE_GENERIC BIT(13)
#define QUIRK_ROG_NKEY_RGB BIT(14)
+#define QUIRK_ROG_NKEY_LEGACY BIT(15)
#define I2C_KEYBOARD_QUIRKS (QUIRK_FIX_NOTEBOOK_REPORT | \
QUIRK_NO_INIT_REPORTS | \
@@ -647,12 +648,25 @@ static int asus_kbd_register_leds(struct hid_device *hdev)
struct asus_drvdata *drvdata = hid_get_drvdata(hdev);
unsigned char kbd_func;
struct asus_kbd_leds *leds;
+ bool rgb_init = true;
int ret;
ret = asus_kbd_init(hdev, FEATURE_KBD_REPORT_ID);
if (ret < 0)
return ret;
+ if (drvdata->quirks & QUIRK_ROG_NKEY_LEGACY) {
+ /*
+ * These keyboards might need 0x5d for shortcuts to work.
+ * As it has been more than 5 years, it is hard to verify.
+ */
+ ret = asus_kbd_init(hdev, FEATURE_KBD_LED_REPORT_ID1);
+ if (ret < 0)
+ return ret;
+
+ rgb_init = false;
+ }
+
/* Get keyboard functions */
ret = asus_kbd_get_functions(hdev, &kbd_func, FEATURE_KBD_REPORT_ID);
if (ret < 0)
@@ -683,7 +697,7 @@ static int asus_kbd_register_leds(struct hid_device *hdev)
leds->rgb_colors[0] = 0;
leds->rgb_colors[1] = 0;
leds->rgb_colors[2] = 0;
- leds->rgb_init = true;
+ leds->rgb_init = rgb_init;
leds->rgb_set = false;
leds->mc_led.led_cdev.name = devm_kasprintf(&hdev->dev, GFP_KERNEL,
"asus-%s:rgb:peripheral",
@@ -1415,10 +1429,10 @@ static const struct hid_device_id asus_devices[] = {
QUIRK_USE_KBD_BACKLIGHT },
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD),
- QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
+ QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD | QUIRK_ROG_NKEY_LEGACY },
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2),
- QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
+ QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD | QUIRK_ROG_NKEY_LEGACY },
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR),
QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD | QUIRK_ROG_NKEY_RGB },
--
2.49.0
prev parent reply other threads:[~2025-03-25 18:46 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-25 18:45 [PATCH v5 00/11] HID: asus: Add RGB Support to Asus Z13, Ally, unify backlight asus-wmi, and Z13 QOL Antheas Kapenekakis
2025-03-25 18:45 ` [PATCH v5 01/11] HID: asus: refactor init sequence per spec Antheas Kapenekakis
2025-03-25 18:45 ` [PATCH v5 02/11] HID: asus: prevent binding to all HID devices on ROG Antheas Kapenekakis
2025-03-25 18:45 ` [PATCH v5 03/11] HID: asus: add Z13 folio to generic group for multitouch to work Antheas Kapenekakis
2025-03-25 18:45 ` [PATCH v5 04/11] platform/x86: asus-wmi: Add support for multiple kbd RGB handlers Antheas Kapenekakis
2025-03-26 19:54 ` kernel test robot
2025-03-25 18:45 ` [PATCH v5 05/11] HID: asus: listen to the asus-wmi brightness device instead of creating one Antheas Kapenekakis
2025-03-25 18:45 ` [PATCH v5 06/11] platform/x86: asus-wmi: remove unused keyboard backlight quirk Antheas Kapenekakis
2025-03-25 18:45 ` [PATCH v5 07/11] platform/x86: asus-wmi: add keyboard brightness event handler Antheas Kapenekakis
2025-03-25 18:45 ` [PATCH v5 08/11] HID: asus: add support for the asus-wmi brightness handler Antheas Kapenekakis
2025-03-25 18:45 ` [PATCH v5 09/11] HID: asus: add basic RGB support Antheas Kapenekakis
2025-03-26 8:54 ` Ilpo Järvinen
2025-03-26 9:09 ` Antheas Kapenekakis
2025-03-26 10:24 ` Ilpo Järvinen
2025-03-26 11:00 ` Jiri Kosina
2025-03-30 8:39 ` Antheas Kapenekakis
2025-03-31 8:19 ` Luke D. Jones
2025-03-31 8:35 ` Antheas Kapenekakis
2025-03-25 18:45 ` [PATCH v5 10/11] HID: asus: add RGB support to the ROG Ally units Antheas Kapenekakis
2025-03-30 22:11 ` Luke D. Jones
2025-03-31 7:52 ` Antheas Kapenekakis
2025-04-10 19:39 ` Antheas Kapenekakis
2025-03-25 18:46 ` Antheas Kapenekakis [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250325184601.10990-12-lkml@antheas.dev \
--to=lkml@antheas.dev \
--cc=bentiss@kernel.org \
--cc=corentin.chary@gmail.com \
--cc=hdegoede@redhat.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luke@ljones.dev \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).