[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250324210151.6042-12-lkml@antheas.dev>
Date: Mon, 24 Mar 2025 22:01:51 +0100
From: Antheas Kapenekakis <lkml@...heas.dev>
To: platform-driver-x86@...r.kernel.org,
linux-input@...r.kernel.org
Cc: linux-kernel@...r.kernel.org,
Jiri Kosina <jikos@...nel.org>,
Benjamin Tissoires <bentiss@...nel.org>,
Corentin Chary <corentin.chary@...il.com>,
"Luke D . Jones" <luke@...nes.dev>,
Hans de Goede <hdegoede@...hat.com>,
Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>,
Antheas Kapenekakis <lkml@...heas.dev>
Subject: [PATCH v4 11/11] HID: asus: initialize LED endpoint early for old
NKEY keyboards
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@...heas.dev>
---
drivers/hid/hid-asus.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
index 7025c6971431d..8da47483272c0 100644
--- a/drivers/hid/hid-asus.c
+++ b/drivers/hid/hid-asus.c
@@ -87,6 +87,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 | \
@@ -648,13 +649,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 no_led;
+ bool no_led, 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)
@@ -685,7 +698,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",
@@ -1424,10 +1437,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
Powered by blists - more mailing lists